From 77a0a5b5194d4441c86de097f2aae297cb75e2c2 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Thu, 9 Jan 2020 20:08:10 -0500 Subject: [PATCH] src: mv ../buildEnvironmentVariables mkhdr Also note that the file must be valid shell and mk input. For #321. --- dist/buildmk | 2 +- buildEnvironmentVariables => src/mkenv | 3 +++ src/mkhdr | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) rename buildEnvironmentVariables => src/mkenv (82%) 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/buildEnvironmentVariables b/src/mkenv similarity index 82% rename from buildEnvironmentVariables rename to src/mkenv index f6de1e35..6ff746e0 100644 --- a/buildEnvironmentVariables +++ b/src/mkenv @@ -1,3 +1,6 @@ +# 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;; 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