Improve the per-branch build dir support

The release script & the patch management script now require the use of
an auto-build-save dir that makes it much easier to keep the generated
files from melding together, and remembers the configure setup for each
patch branch.

1 files changed, 9 insertions, 7 deletions

diff --git a/configure b/configure
index 75b9ed7c..51c3fee5 100755
--- a/configure
+++ b/configure
@@ -4,14 +4,16 @@
 # then transfer control to the configure.sh script to do the real work.
 
 dir=`dirname $0`
+if test x"$dir" = x; then
+    dir=.
+fi
 
-# Support automatic switching to build/$BRANCH subdirs.  It's also good
-# to put packaging/make somewhere early in your $PATH if you use this!
-if test "$dir" = '.' -a ! -f Makefile -a -d build/master -a -d .git; then
-    builddir=build/`git rev-parse --abbrev-ref HEAD | tr / %`
-    test -d "$builddir" || mkdir "$builddir"
-    cd "$builddir" || exit 1
-    dir=../..
+if test "$dir" = '.'; then
+    branch=`packaging/prep-auto-dir` || exit 1
+    if test x"$branch" != x; then
+	cd build || exit 1
+	dir=..
+    fi
 fi
 
 if test ! -f configure.sh; then