tbuild: use installbsd instead of install on AIX - plan9port - [fork] Plan 9 from user space
HTML git clone git://src.adamsgaard.dk/plan9port
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 6c1235d234dfe290c61c492a1779c7a3ad2f7fc6
DIR parent fa157263c8f510318f1f119a2d4843281e506eba
HTML Author: Russ Cox <rsc@swtch.com>
Date: Mon, 18 May 2020 22:46:16 -0400
build: use installbsd instead of install on AIX
Even in mkmk.sh.
Diffstat:
M dist/buildmk | 2 +-
D src/mk.AIX-power | 2 --
M src/mkenv | 1 +
M src/mkfile | 3 ++-
M src/mkhdr | 3 ---
M src/mkmk.sh | 2 +-
6 files changed, 5 insertions(+), 8 deletions(-)
---
DIR diff --git a/dist/buildmk b/dist/buildmk
t@@ -2,5 +2,5 @@
# run this in the src directory
. ../src/mkenv
-export SYSNAME OBJTYPE
+export SYSNAME OBJTYPE INSTALL
sh -x mkmk.sh
DIR diff --git a/src/mk.AIX-power b/src/mk.AIX-power
t@@ -1,2 +0,0 @@
-INSTALL=installbsd
-
DIR diff --git a/src/mkenv b/src/mkenv
t@@ -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`
DIR diff --git a/src/mkfile b/src/mkfile
t@@ -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
DIR diff --git a/src/mkhdr b/src/mkhdr
t@@ -11,7 +11,6 @@ CC=9c
LD=9l
AS=9a
AR=9ar
-INSTALL=install
CFLAGS=
LDFLAGS=
AFLAGS=
t@@ -24,5 +23,3 @@ LIB=
SHORTLIB=9
<|cat $PLAN9/config 2>/dev/null || true
-<|cat $PLAN9/src/mk.$SYSNAME-$OBJTYPE 2>/dev/null || true
-
DIR diff --git a/src/mkmk.sh b/src/mkmk.sh
t@@ -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 ..