commit - 5aad8f3d6d24ee109ea23514862fa579191cb5e4
commit + 77a0a5b5194d4441c86de097f2aae297cb75e2c2
blob - f6de1e350da223380cffaae5f49e182acf1ad104 (mode 644)
blob + /dev/null
--- buildEnvironmentVariables
+++ /dev/null
@@ -1,19 +0,0 @@
-SYSNAME=`uname`
-OBJTYPE=`(uname -m -p 2>/dev/null || uname -m) | sed '
-	s;.*i[3-6]86.*;386;;
-	s;.*i86pc.*;386;;
-	s;.*amd64.*;x86_64;;
-	s;.*x86_64.*;x86_64;;
-	s;.*armv.*;arm;g;
-	s;.*powerpc.*;power;g;
-	s;.*PowerMacintosh.*;power;g;
-	s;.*Power.Macintosh.*;power;g;
-	s;.*macppc.*;power;g;
-	s;.*mips.*;mips;g;
-	s;.*ppc64.*;power;g;
-	s;.*ppc.*;power;g;
-	s;.*alpha.*;alpha;g;
-	s;.*sun4u.*;sun4u;g;
-	s;.*aarch64.*;arm64;
-	s;.*arm64.*;arm64;
-'`
blob - 6be4ba50fb28461d06e76ac5034bb4f7a0fbd35f
blob + c559570cdcd5b29b21cadb8e571e3becc4d0671e
--- dist/buildmk
+++ dist/buildmk
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 # run this in the src directory
+. ../src/mkenv
 export SYSNAME OBJTYPE
-. ../buildEnvironmentVariables
 sh -x mkmk.sh
blob - /dev/null
blob + 6ff746e08a43839cbff5a19994b5495694eea9d6 (mode 644)
--- /dev/null
+++ src/mkenv
@@ -0,0 +1,22 @@
+# This file must be valid mk input for mkhdr
+# and also valid shell input for ../dist/buildmk
+
+SYSNAME=`uname`
+OBJTYPE=`(uname -m -p 2>/dev/null || uname -m) | sed '
+	s;.*i[3-6]86.*;386;;
+	s;.*i86pc.*;386;;
+	s;.*amd64.*;x86_64;;
+	s;.*x86_64.*;x86_64;;
+	s;.*armv.*;arm;g;
+	s;.*powerpc.*;power;g;
+	s;.*PowerMacintosh.*;power;g;
+	s;.*Power.Macintosh.*;power;g;
+	s;.*macppc.*;power;g;
+	s;.*mips.*;mips;g;
+	s;.*ppc64.*;power;g;
+	s;.*ppc.*;power;g;
+	s;.*alpha.*;alpha;g;
+	s;.*sun4u.*;sun4u;g;
+	s;.*aarch64.*;arm64;
+	s;.*arm64.*;arm64;
+'`
blob - 03447df9339b8974a59482468aaa3fe7cf174eda
blob + 24889cded11748c2c2337d43ef3d4530791e88c3
--- src/mkhdr
+++ src/mkhdr
@@ -1,4 +1,4 @@
-<$PLAN9/buildEnvironmentVariables
+<$PLAN9/src/mkenv
 
 BIN=$PLAN9/bin
 LIBDIR=$PLAN9/lib