From 77a0a5b5194d4441c86de097f2aae297cb75e2c2 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Thu, 9 Jan 2020 20:08:10 -0500
Subject: src: mv ../buildEnvironmentVariables mkhdr

Also note that the file must be valid shell and mk input.
For #321.
---
 buildEnvironmentVariables | 19 -------------------
 dist/buildmk              |  2 +-
 src/mkenv                 | 22 ++++++++++++++++++++++
 src/mkhdr                 |  2 +-
 4 files changed, 24 insertions(+), 21 deletions(-)
 delete mode 100644 buildEnvironmentVariables
 create mode 100644 src/mkenv

diff --git a/buildEnvironmentVariables b/buildEnvironmentVariables
deleted file mode 100644
index f6de1e35..00000000
--- a/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;
-'`
diff --git a/dist/buildmk b/dist/buildmk
index 6be4ba50..c559570c 100755
--- a/dist/buildmk
+++ b/dist/buildmk
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 # run this in the src directory
+. ../src/mkenv
 export SYSNAME OBJTYPE
-. ../buildEnvironmentVariables
 sh -x mkmk.sh
diff --git a/src/mkenv b/src/mkenv
new file mode 100644
index 00000000..6ff746e0
--- /dev/null
+++ b/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;
+'`
diff --git a/src/mkhdr b/src/mkhdr
index 03447df9..24889cde 100644
--- a/src/mkhdr
+++ b/src/mkhdr
@@ -1,4 +1,4 @@
-<$PLAN9/buildEnvironmentVariables
+<$PLAN9/src/mkenv
 
 BIN=$PLAN9/bin
 LIBDIR=$PLAN9/lib
-- 
cgit v1.2.3