plan9: refactor building scripts

libressl · May 31, 2019 · 6fb8a3d · 6fb8a3d
1 parent 177dca4
commit 6fb8a3d
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 349 deletions.
diff --git a/autogen.rc b/autogen.rc
@@ -1,12 +1,13 @@
 #!/bin/rc
 
+flag e +
 rfork ne
 
-./update.rc
-ape/patch -p0 <plan9/crypto.patch
-ape/patch -p0 <plan9/ssl.patch
-ape/patch -p0 <plan9/tls.patch
-ape/patch -p0 <plan9/apps.patch
-
-bind -a /$cputype/bin/ape /bin
-./gen-mkfiles-all.sh
+if(! test -f /bin/sh)
+	bind -b /$cputype/bin/ape /bin
+./update.sh
+./gen-mkfile.sh lib crypto/Makefile.am
+./gen-mkfile.sh lib ssl/Makefile.am
+./gen-mkfile.sh lib tls/Makefile.am
+./gen-mkfile.sh bin apps/openssl/Makefile.am
+./gen-mkfile.sh include include/Makefile.am
diff --git a/gen-mkfile.sh b/gen-mkfile.sh
@@ -7,12 +7,6 @@ if [ $# -ne 3 -a $# -ne 2 ]; then
 	exit 2
 fi
 
-# Plan 9 don't have dirname(1), instead use basename -d
-if ! type dirname >/dev/null 2>&1
-then
-	dirname() { basename -d "$@"; }
-fi
-
 target=$1
 wdir=`dirname $2`
 recipe=`basename $2`

diff --git a/gen-mkfiles-all.sh b/gen-mkfiles-all.sh
diff --git a/update.rc b/update.rc