tmake scripts work with more shells, use current variable names. - plan9port - [fork] Plan 9 from user space (HTM) git clone git://src.adamsgaard.dk/plan9port (DIR) Log (DIR) Files (DIR) Refs (DIR) README (DIR) LICENSE --- (DIR) commit 7ac9b0e140bed0b34dc88674b3098caa5e193acf (DIR) parent 0d6c3c240826f43de3937071769a531821c5b4a7 (HTM) Author: rsc <devnull@localhost> Date: Wed, 21 Apr 2004 05:49:52 +0000 make scripts work with more shells, use current variable names. Diffstat: M src/libmp/mkfile | 2 +- M src/libmp/port/mkfile | 2 +- M src/libmp/port/reduce | 6 ++++-- M src/libsec/mkfile | 2 +- M src/libsec/port/mkfile | 4 +++- 5 files changed, 10 insertions(+), 6 deletions(-) --- (DIR) diff --git a/src/libmp/mkfile b/src/libmp/mkfile t@@ -2,6 +2,6 @@ DIRS=\ port\ - $objtype\ + $OBJTYPE\ <$PLAN9/src/mkdirs (DIR) diff --git a/src/libmp/port/mkfile b/src/libmp/port/mkfile t@@ -35,7 +35,7 @@ FILES=\ ALLOFILES=${FILES:%=%.$O} # cull things in the per-machine directories from this list -OFILES= `{sh ./reduce $O $objtype $ALLOFILES} +OFILES= `{sh ./reduce $O $OBJTYPE $ALLOFILES} HFILES=\ $PLAN9/include/lib9.h\ (DIR) diff --git a/src/libmp/port/reduce b/src/libmp/port/reduce t@@ -3,6 +3,8 @@ shift objtype=$1 shift -reduce="("`ls -p ../$objtype/*.[cs] 2>/dev/null | sed 's/..$//' | sed 's/^.*\///' | tr '\012' '|' | sed 's/.$//'`")" +nl=' +' +reduce="("`ls -p ../$objtype/*.[cs] 2>/dev/null | sed 's/..$//' | sed 's/^.*\///' | tr "$nl" '|' | sed 's/.$//'`")" -echo $* | tr ' ' '\012' | egrep -v $reduce | tr \012 ' ' +echo $* | tr ' ' "$nl" | egrep -v $reduce | tr "$nl" ' ' (DIR) diff --git a/src/libsec/mkfile b/src/libsec/mkfile t@@ -2,6 +2,6 @@ DIRS=\ port\ -# $systype-$objtype\ + $OBJTYPE\ <$PLAN9/src/mkdirs (DIR) diff --git a/src/libsec/port/mkfile b/src/libsec/port/mkfile t@@ -2,7 +2,7 @@ LIB=libsec.a -OFILES=\ +ALLOFILES=\ aes.$O\ blowfish.$O\ decodepem.$O\ t@@ -54,6 +54,8 @@ OFILES=\ tlshand.$O\ x509.$O\ +OFILES=`{sh ./reduce $O $OBJTYPE $ALLOFILES} + HFILES=$PLAN9/include/libsec.h <$PLAN9/src/mksyslib