PREFIX stuff

diff --git a/adduser/Makefile b/adduser/Makefile
index 5cb44ec01a375ee0889c822feab5c5d8abdd8ee6..f181e6991a6f41a13ea5a4d91ff8b43104f4f91d 100644 (file)
--- a/adduser/Makefile
+++ b/adduser/Makefile
@@ -1,7 +1,7 @@
-PREFIX          ?= /usr
 DESTDIR         ?=
 MEMO_PREFIX     ?=
 MEMO_SUB_PREFIX ?= /usr
+PREFIX          ?= $(MEMO_PREFIX)$(MEMO_SUB_PREFIX)
 
 all: adduser rmuser
 

diff --git a/chpass/Makefile b/chpass/Makefile
index 6ca375a75ff3a2c737b4c46a20b8bdb717a39fde..31472a3974322a9b9bc03d48cbcd621f7e0c24c0 100644 (file)
--- a/chpass/Makefile
+++ b/chpass/Makefile
@@ -3,7 +3,7 @@ STRIP           ?= aarch64-apple-darwin-strip
 LDID            ?= ldid
 CFLAGS          ?= -arch arm64  -isysroot /home/cameron/Documents/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=13.0
 LDFLAGS         ?=
-PREFIX          ?= /usr
+PREFIX          ?= $(MEMO_PREFIX)$(MEMO_SUB_PREFIX)
 DESTDIR         ?=
 
 SRC := chpass.c \
@@ -34,8 +34,8 @@ install-chpass: chpass chpass.1
        ln -sf chpass $(DESTDIR)/$(PREFIX)/bin/chfn
        ln -sf chpass $(DESTDIR)/$(PREFIX)/bin/chsh
        install -Dm644 chpass.1 $(DESTDIR)/$(PREFIX)/share/man/man1/chpass.1
-       ln -sf chpass.1.zst $(DESTDIR)/$(PREFIX)/share/man/man1/chfn.1
-       ln -sf chpass.1.zst $(DESTDIR)/$(PREFIX)/share/man/man1/chsh.1
+       ln -sf chpass.1 $(DESTDIR)/$(PREFIX)/share/man/man1/chfn.1
+       ln -sf chpass.1 $(DESTDIR)/$(PREFIX)/share/man/man1/chsh.1
 
 clean:
        rm -f chpass $(SRC:%.c=%.o)

diff --git a/pw/Makefile b/pw/Makefile
index c282e62888ffd6e62632426a050d3d1bbf100ee8..6aa63083bb0f36270fa83b093a63989f658bd757 100644 (file)
--- a/pw/Makefile
+++ b/pw/Makefile
@@ -3,7 +3,7 @@ STRIP           ?= aarch64-apple-darwin-strip
 LDID            ?= ldid
 CFLAGS          ?= -arch arm64  -isysroot /home/cameron/Documents/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=13.0
 LDFLAGS         ?=
-PREFIX          ?= /usr
+PREFIX          ?= $(MEMO_PREFIX)$(MEMO_SUB_PREFIX)
 DESTDIR         ?=
 
 SRC := pw_utils.c \