Build tweaksintegrated

    ./configure, when run automatically, now remembers
    your prefix and such.

    Also, mbld correctly reruns it.

3 files changed, 12 insertions, 3 deletions

diff --git a/configure b/configure
index ed73eb1..0af6d2a 100755
--- a/configure
+++ b/configure
@@ -14,6 +14,11 @@ prefix="/usr/local"
 for arg in $*; do
     shift 1
     case $arg in
+        "--redo" | "-r")
+            if [ -f ./var_cache ]; then
+                . ./var_cache
+            fi
+            ;;
         "--prefix" | "-p") 
             prefix=shift $*
             ;;
@@ -86,7 +91,7 @@ echo ";;" >> mbld/config.myr
 case $MACH in
     *x86_64*)
         echo 'export ARCH=x64' >> config.mk
-        echo 'const Arch = "FreeBSD"' >> mbld/config.myr
+        echo 'const Arch = "x64"' >> mbld/config.myr
         ;;
     *)
         echo ''
@@ -96,6 +101,8 @@ case $MACH in
         echo '********************************'
 esac
 
+echo prefix=$prefix > var_cache
+
 cat << EOF
     Building with:
         prefix=$prefix
diff --git a/mbld/bldfile b/mbld/bldfile
index 4137876..1986947 100644
--- a/mbld/bldfile
+++ b/mbld/bldfile
@@ -24,7 +24,9 @@ bin mbld =
 	lib ../libregex:regex
 ;;
 
-gen config.myr {durable} = ../configure ;;
+gen config.myr {durable} =
+	sh -c "cd .. && ./configure --redo"
+;;
 
 man = mbld.1;;
 
diff --git a/mk/c.mk b/mk/c.mk
index 0a7f212..45a249a 100644
--- a/mk/c.mk
+++ b/mk/c.mk
@@ -117,6 +117,6 @@ uninstall: subdirs-uninstall
 	mkdir -p $(_DEPSDIR)
 
 config.mk: configure
-	./configure
+	./configure --redo
 
 -include $(_DEPS)