summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--adduser/Makefile21
-rw-r--r--adduser/adduser.sh2
-rw-r--r--adduser/rmuser.sh2
-rw-r--r--chpass/Makefile19
-rw-r--r--pw/Makefile17
5 files changed, 31 insertions, 30 deletions
diff --git a/adduser/Makefile b/adduser/Makefile
index f181e69..a983a4e 100644
--- a/adduser/Makefile
+++ b/adduser/Makefile
@@ -1,7 +1,6 @@
DESTDIR ?=
MEMO_PREFIX ?=
MEMO_SUB_PREFIX ?= /usr
-PREFIX ?= $(MEMO_PREFIX)$(MEMO_SUB_PREFIX)
all: adduser rmuser
@@ -21,17 +20,17 @@ clean:
install: install-adduser install-rmuser
install-adduser: adduser adduser.8 adduser.conf.5
- install -d $(DESTDIR)/$(PREFIX)/sbin \
- $(DESTDIR)/$(PREFIX)/share/man/man5 \
- $(DESTDIR)/$(PREFIX)/share/man/man8
- install -m755 adduser $(DESTDIR)/$(PREFIX)/sbin/adduser
- install -m644 adduser.8 $(DESTDIR)/$(PREFIX)/share/man/man8/adduser.8
- install -m644 adduser.conf.5 $(DESTDIR)/$(PREFIX)/share/man/man5/adduser.conf.5
+ install -d $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/sbin \
+ $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man5 \
+ $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man8
+ install -m755 adduser $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/sbin/adduser
+ install -m644 adduser.8 $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man8/adduser.8
+ install -m644 adduser.conf.5 $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man5/adduser.conf.5
install-rmuser: rmuser rmuser.8
- install -d $(DESTDIR)/$(PREFIX)/sbin \
- $(DESTDIR)/$(PREFIX)/share/man/man8
- install -m755 rmuser $(DESTDIR)/$(PREFIX)/sbin/rmuser
- install -m644 rmuser.8 $(DESTDIR)/$(PREFIX)/share/man/man8/rmuser.8
+ install -d $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/sbin \
+ $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man8
+ install -m755 rmuser $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/sbin/rmuser
+ install -m644 rmuser.8 $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man8/rmuser.8
.PHONY: all install install-adduser install-rmuser clean
diff --git a/adduser/adduser.sh b/adduser/adduser.sh
index 3cb11b8..dd4a5ac 100644
--- a/adduser/adduser.sh
+++ b/adduser/adduser.sh
@@ -838,7 +838,7 @@ input_interactive() {
#### END SUBROUTINE DEFINITION ####
THISCMD=`@MEMO_PREFIX@@MEMO_SUB_PREFIX@/bin/basename $0`
-DEFAULTSHELL=@PREFIX@/bin/sh
+DEFAULTSHELL=@MEMO_PREFIX@/bin/sh
ADDUSERCONF="${ADDUSERCONF:-@MEMO_PREFIX@/etc/adduser.conf}"
PWCMD="${PWCMD:-@MEMO_PREFIX@@MEMO_SUB_PREFIX@/sbin/pw}"
MAILCMD="${MAILCMD:-mail}"
diff --git a/adduser/rmuser.sh b/adduser/rmuser.sh
index 9252216..998b715 100644
--- a/adduser/rmuser.sh
+++ b/adduser/rmuser.sh
@@ -35,7 +35,7 @@ MAILSPOOL="@MEMO_PREFIX@/var/mail"
SIGKILL="-KILL"
TEMPDIRS="@MEMO_PREFIX@/tmp @MEMO_PREFIX@/var/tmp"
THISCMD=`@MEMO_PREFIX@@MEMO_SUB_PREFIX@/bin/basename $0`
-PWCMD="${PWCMD:-@MEMO_PREFIX@@MEMO_PREFIX@/sbin/pw}"
+PWCMD="${PWCMD:-@MEMO_PREFIX@@MEMO_SUB_PREFIX@/sbin/pw}"
# err msg
# Display $msg on stderr.
diff --git a/chpass/Makefile b/chpass/Makefile
index 31472a3..666c169 100644
--- a/chpass/Makefile
+++ b/chpass/Makefile
@@ -3,7 +3,8 @@ 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 ?= $(MEMO_PREFIX)$(MEMO_SUB_PREFIX)
+MEMO_PREFIX ?=
+MEMO_SUB_PREFIX ?= /usr
DESTDIR ?=
SRC := chpass.c \
@@ -28,14 +29,14 @@ chpass: $(SRC:%.c=%.o) ../ent.xml
$(CC) $(CFLAGS) -c -o $@ $< -I. -I../libutil -I../libc/gen
install-chpass: chpass chpass.1
- install -d $(DESTDIR)/$(PREFIX)/bin \
- $(DESTDIR)/$(PREFIX)/share/man/man1
- install -m4555 chpass $(DESTDIR)/$(PREFIX)/bin/chpass
- 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 $(DESTDIR)/$(PREFIX)/share/man/man1/chfn.1
- ln -sf chpass.1 $(DESTDIR)/$(PREFIX)/share/man/man1/chsh.1
+ install -d $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin \
+ $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man1
+ install -m4555 chpass $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/chpass
+ ln -sf chpass $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/chfn
+ ln -sf chpass $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/chsh
+ install -Dm644 chpass.1 $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man1/chpass.1
+ ln -sf chpass.1 $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man1/chfn.1
+ ln -sf chpass.1 $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man1/chsh.1
clean:
rm -f chpass $(SRC:%.c=%.o)
diff --git a/pw/Makefile b/pw/Makefile
index 6aa6308..a673ef7 100644
--- a/pw/Makefile
+++ b/pw/Makefile
@@ -3,7 +3,8 @@ 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 ?= $(MEMO_PREFIX)$(MEMO_SUB_PREFIX)
+MEMO_PREFIX ?=
+MEMO_SUB_PREFIX ?= /usr
DESTDIR ?=
SRC := pw_utils.c \
@@ -45,13 +46,13 @@ pw: $(SRC:%.c=%.o) $(LIBCSRC:%.c=%.o) $(LIBUTILSRC:%.c=%.o) ../ent.xml
$(CC) $(CFLAGS) -c -o $@ $< -I. -I../libutil -I../libc/gen
install-pw: pw pw.8 pw.conf.5
- install -d $(DESTDIR)/$(PREFIX)/share/skel \
- $(DESTDIR)/$(PREFIX)/sbin \
- $(DESTDIR)/$(PREFIX)/share/man/man5 \
- $(DESTDIR)/$(PREFIX)/share/man/man8
- install -m755 pw $(DESTDIR)/$(PREFIX)/sbin/pw
- install -m644 pw.8 $(DESTDIR)/$(PREFIX)/share/man/man8/pw.8
- install -m644 pw.conf.5 $(DESTDIR)/$(PREFIX)/share/man/man5/pw.conf.5
+ install -d $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/skel \
+ $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/sbin \
+ $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man5 \
+ $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man8
+ install -m755 pw $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/sbin/pw
+ install -m644 pw.8 $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man8/pw.8
+ install -m644 pw.conf.5 $(DESTDIR)/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man5/pw.conf.5
clean:
rm -f pw $(SRC:%.c=%.o) $(LIBCSRC:%.c=%.o) $(LIBUTILSRC:%.c=%.o)