20070411-1324 issue 41

3 files changed, 10 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index 24bd2c7e..a4aff650 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+20070411
+	if mkconfig has been changed from the distribution, use it to set parameters in makemk.sh (issue 41)
 20070410
 	fix some porting errors in /appl/cmd/look.b
 	document look's -r option in look(1)
diff --git a/include/version.h b/include/version.h
index ae187cca..9c4688af 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION	"Fourth Edition (20070410)"
+#define VERSION	"Fourth Edition (20070411)"
diff --git a/makemk.sh b/makemk.sh
index 5bbce2db..48bf973f 100755
--- a/makemk.sh
+++ b/makemk.sh
@@ -6,13 +6,19 @@
 
 #	support@vitanuova.com
 
-# change these defines as appropriate
+# change these defines as appropriate here or in mkconfig
 # ROOT should be the root of the Inferno tree
 ROOT=/usr/inferno
 SYSTARG=FreeBSD
 OBJTYPE=386
 SYSTYPE=posix
+
+# if you have already changed mkconfig from the distribution, we'll use the definitions from that
+grep -s 'SYSTARG=Plan9' mkconfig || . ./mkconfig
+
 PLAT=$ROOT/$SYSTARG/$OBJTYPE
+
+# you might need to adjust the CC, LD, AR, and RANLIB definitions after this point
 CC="p gcc -c -I$PLAT/include -I$ROOT/include -I$ROOT/utils/include"
 LD="p gcc"
 AR="p ar crvs"