Make all calls to install POSIX

diff --git a/adduser/Makefile b/adduser/Makefile
index 7d67923dd5d6ad9215f89029616228197768590a..b1755ca2f0f1c3303d7491a0bbf2a452b01b4e2d 100644 (file)
--- a/adduser/Makefile
+++ b/adduser/Makefile
@@ -1,4 +1,3 @@
-GINSTALL        ?= install
 PREFIX          ?= /usr
 DESTDIR         ?=
 
@@ -11,12 +10,17 @@ clean:
 install: install-adduser install-rmuser
 
 install-adduser: adduser.sh adduser.8 adduser.conf.5
-       $(GINSTALL) -Dm755 adduser.sh $(DESTDIR)/$(PREFIX)/sbin/adduser
-       $(GINSTALL) -Dm644 adduser.8 $(DESTDIR)/$(PREFIX)/share/man/man8/adduser.8
-       $(GINSTALL) -Dm644 adduser.conf.5 $(DESTDIR)/$(PREFIX)/share/man/man5/adduser.conf.5
+       install -d $(DESTDIR)/$(PREFIX)/sbin \
+               $(DESTDIR)/$(PREFIX)/share/man/man5 \
+               $(DESTDIR)/$(PREFIX)/share/man/man8
+       install -m755 adduser.sh $(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-rmuser: rmuser.sh rmuser.8
-       $(GINSTALL) -Dm755 rmuser.sh $(DESTDIR)/$(PREFIX)/sbin/rmuser
-       $(GINSTALL) -Dm644 rmuser.8 $(DESTDIR)/$(PREFIX)/share/man/man8/rmuser.8
+       install -d $(DESTDIR)/$(PREFIX)/sbin \
+               $(DESTDIR)/$(PREFIX)/share/man/man8
+       install -m755 rmuser.sh $(DESTDIR)/$(PREFIX)/sbin/rmuser
+       install -m644 rmuser.8 $(DESTDIR)/$(PREFIX)/share/man/man8/rmuser.8
 
 .PHONY: all install install-adduser install-rmuser clean

diff --git a/chpass/Makefile b/chpass/Makefile
index 1715a4c768eb6551d4f4002ba55b2d3f3116ba6b..6ca375a75ff3a2c737b4c46a20b8bdb717a39fde 100644 (file)
--- a/chpass/Makefile
+++ b/chpass/Makefile
@@ -3,7 +3,6 @@ STRIP           ?= aarch64-apple-darwin-strip
 LDID            ?= ldid
 CFLAGS          ?= -arch arm64  -isysroot /home/cameron/Documents/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=13.0
 LDFLAGS         ?=
-GINSTALL        ?= install
 PREFIX          ?= /usr
 DESTDIR         ?=
 
@@ -29,10 +28,12 @@ chpass: $(SRC:%.c=%.o) ../ent.xml
        $(CC) $(CFLAGS) -c -o $@ $< -I. -I../libutil -I../libc/gen
 
 install-chpass: chpass chpass.1
-       $(GINSTALL) -Dm4555 chpass $(DESTDIR)/$(PREFIX)/bin/chpass
+       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
-       $(GINSTALL) -Dm644 chpass.1 $(DESTDIR)/$(PREFIX)/share/man/man1/chpass.1
+       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
 

diff --git a/pw/Makefile b/pw/Makefile
index dc57d1d2f10dd9e1084b70d4ebfa34790be3d95b..c282e62888ffd6e62632426a050d3d1bbf100ee8 100644 (file)
--- a/pw/Makefile
+++ b/pw/Makefile
@@ -3,7 +3,6 @@ STRIP           ?= aarch64-apple-darwin-strip
 LDID            ?= ldid
 CFLAGS          ?= -arch arm64  -isysroot /home/cameron/Documents/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=13.0
 LDFLAGS         ?=
-GINSTALL        ?= install
 PREFIX          ?= /usr
 DESTDIR         ?=
 
@@ -46,10 +45,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
-       $(GINSTALL) -Dm755 pw $(DESTDIR)/$(PREFIX)/sbin/pw
-       $(GINSTALL) -Dm644 pw.8 $(DESTDIR)/$(PREFIX)/share/man/man8/pw.8
-       $(GINSTALL) -Dm644 pw.conf.5 $(DESTDIR)/$(PREFIX)/share/man/man5/pw.conf.5
-       mkdir -p $(DESTDIR)/$(PREFIX)/share/skel
+       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
 
 clean:
        rm -f pw $(SRC:%.c=%.o) $(LIBCSRC:%.c=%.o) $(LIBUTILSRC:%.c=%.o)