diff options
| author | June McEnroe <june@causal.agency> | 2020-12-21 16:33:08 -0500 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2020-12-21 16:33:08 -0500 |
| commit | 6528ea0dab2f1e49d2af2140ad82ddd0e047379b (patch) | |
| tree | bfecbeed199ab19852d4f6847fb4af7afd4dd23b | |
| parent | Update PDF URLs (diff) | |
| download | src-6528ea0dab2f1e49d2af2140ad82ddd0e047379b.tar.gz src-6528ea0dab2f1e49d2af2140ad82ddd0e047379b.zip | |
Move wcfix to port/wcwidth
| -rw-r--r-- | port/wcwidth/.gitignore | 3 | ||||
| -rw-r--r-- | port/wcwidth/Makefile | 24 | ||||
| -rw-r--r--[-rwxr-xr-x] | port/wcwidth/wcfix.in (renamed from home/.local/bin/wcfix) | 2 |
3 files changed, 19 insertions, 10 deletions
diff --git a/port/wcwidth/.gitignore b/port/wcwidth/.gitignore index aa25f78d..132e8098 100644 --- a/port/wcwidth/.gitignore +++ b/port/wcwidth/.gitignore @@ -1,2 +1,3 @@ *.o -*.dylib +libwcwidth.dylib +wcfix diff --git a/port/wcwidth/Makefile b/port/wcwidth/Makefile index f6932d6d..50faa653 100644 --- a/port/wcwidth/Makefile +++ b/port/wcwidth/Makefile @@ -1,19 +1,27 @@ -PREFIX = ~/.local +PREFIX ?= ~/.local OBJS = wcwidth.o wcswidth.o -DYLIB = libwcwidth.dylib -${DYLIB}: ${OBJS} +all: libwcwidth.dylib wcfix + +libwcwidth.dylib: ${OBJS} ${CC} -dynamiclib ${LDFLAGS} ${OBJS} -o $@ wcwidth.o: nonspacing.h wide.h +.SUFFIXES: .in + +.in: + sed 's|%%PREFIX%%|${PREFIX}|g' $< > $@ + chmod a+x $@ + clean: - rm -f ${DYLIB} ${OBJS} + rm -f libwcwidth.dylib wcfix ${OBJS} -install: ${DYLIB} - install -d ${PREFIX}/lib - install -m 644 ${DYLIB} ${PREFIX}/lib +install: libwcwidth.dylib wcfix + install -d ${PREFIX}/lib ${PREFIX}/bin + install -m 644 libwcwidth.dylib ${PREFIX}/lib + install wcfix ${PREFIX}/bin uninstall: - rm -f ${PREFIX}/lib/${DYLIB} + rm -f ${PREFIX}/lib/libwcwidth.dylib ${PREFIX}/bin/wcfix diff --git a/home/.local/bin/wcfix b/port/wcwidth/wcfix.in index b31bd19b..832c83d6 100755..100644 --- a/home/.local/bin/wcfix +++ b/port/wcwidth/wcfix.in @@ -2,6 +2,6 @@ set -eu export DYLD_FORCE_FLAT_NAMESPACE=1 -export DYLD_INSERT_LIBRARIES=~/.local/lib/libwcwidth.dylib +export DYLD_INSERT_LIBRARIES=%%PREFIX%%/lib/libwcwidth.dylib exec "$@" |