From fc8dc81ba2dc542f1a665fc07b585bedd439a7f6 Mon Sep 17 00:00:00 2001
From: Cameron Katri <me@cameronkatri.com>
Date: Sun, 2 Jan 2022 16:27:03 -0500
Subject: Fix PREFIX logic

---
 adduser/Makefile   | 21 ++++++++++-----------
 adduser/adduser.sh |  2 +-
 adduser/rmuser.sh  |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'adduser')

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.
-- 
cgit v1.2.3-56-ge451