Commit Diff


commit - fa157263c8f510318f1f119a2d4843281e506eba
commit + 6c1235d234dfe290c61c492a1779c7a3ad2f7fc6
blob - c559570cdcd5b29b21cadb8e571e3becc4d0671e
blob + cd11417c03922ab01887c0c4fd67739701694059
--- dist/buildmk
+++ dist/buildmk
@@ -2,5 +2,5 @@
 
 # run this in the src directory
 . ../src/mkenv
-export SYSNAME OBJTYPE
+export SYSNAME OBJTYPE INSTALL
 sh -x mkmk.sh
blob - 39f8ee8a2fa11638cf7336e371507895214f55f9 (mode 644)
blob + /dev/null
--- src/mk.AIX-power
+++ /dev/null
@@ -1,2 +0,0 @@
-INSTALL=installbsd
-
blob - 6ff746e08a43839cbff5a19994b5495694eea9d6
blob + 6c89f141bf547bb58db1c45c2aa5041102bae47d
--- src/mkenv
+++ src/mkenv
@@ -20,3 +20,4 @@ OBJTYPE=`(uname -m -p 2>/dev/null || uname -m) | sed '
 	s;.*aarch64.*;arm64;
 	s;.*arm64.*;arm64;
 '`
+INSTALL=`[ $(uname) = AIX ] && echo installbsd || echo install`
blob - 8ddaee2079cc7c2fbda082d522832c231bf22758
blob + 4740780db23f39dfea10b35c68dc42a140261217
--- src/mkfile
+++ src/mkfile
@@ -30,11 +30,12 @@ mkmk.sh:VD:
 		(cd lib9; mk -n -a install)
 		echo cd ..
 		for i in libbio libregexp cmd/mk
-		do	
+		do
 			(cd $i; echo cd $i; echo 'echo cd `pwd`'; mk -n -a install)
 			echo cd ..
 		done
 	) | sed '
+		s/'$INSTALL'/$INSTALL/g
 		s/'$SYSNAME'/$SYSNAME/g
 		s/'$OBJTYPE'/$OBJTYPE/g
 		s;'$PLAN9';$PLAN9;g
blob - 24889cded11748c2c2337d43ef3d4530791e88c3
blob + 35a2ccc54b1c1991971cad8b0df7f6c9af5d69d4
--- src/mkhdr
+++ src/mkhdr
@@ -11,7 +11,6 @@ CC=9c
 LD=9l
 AS=9a
 AR=9ar
-INSTALL=install
 CFLAGS=
 LDFLAGS=
 AFLAGS=
@@ -24,5 +23,3 @@ LIB=
 SHORTLIB=9
 
 <|cat $PLAN9/config 2>/dev/null || true
-<|cat $PLAN9/src/mk.$SYSNAME-$OBJTYPE 2>/dev/null || true
-
blob - 89c311f36a5e0c356d25bcd83141e139e9ccf42e
blob + dfccd36944829290c85e9e0fd2afad1ab6373526
--- src/mkmk.sh
+++ src/mkmk.sh
@@ -209,5 +209,5 @@ echo cd `pwd`
 9c  word.c
 9c  unix.c
 9l -o o.mk arc.o archive.o bufblock.o env.o file.o graph.o job.o lex.o main.o match.o mk.o parse.o recipe.o rc.o rule.o run.o sh.o shell.o shprint.o symtab.o var.o varsub.o word.o unix.o 
-install o.mk $PLAN9/bin/mk
+$INSTALL o.mk $PLAN9/bin/mk
 cd ..