binbuild.sh was using the ancient syntax --with-layout=BinaryDistribution

instead of --enable-layout=BinaryDistribution

I changed the layout for BinaryDistribution to install under
/usr/local/apache2 instead of /usr/local/apache.  Hopefully the
rest of the layout is reasonable.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95089 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/binbuild.sh b/build/binbuild.sh
index 2c3d23a6c8f61208479d739de4fb6caff23a4238..ebf7efcf7e53445ae088ab4814e94993e9baeae5 100755 (executable)
--- a/build/binbuild.sh
+++ b/build/binbuild.sh
@@ -12,7 +12,7 @@ DEFAULT_DIR="/usr/local/apache2"
 APDIR=`pwd`
 APDIR=`basename $APDIR`
 APFULLDIR=`pwd`
-CONFIGPARAM="--with-layout=BinaryDistribution --prefix=$BUILD_DIR --enable-mods-shared=most --with-expat=$APFULLDIR/srclib/apr-util/xml/expat --enable-static-support"
+CONFIGPARAM="--enable-layout=BinaryDistribution --prefix=$BUILD_DIR --enable-mods-shared=most --with-expat=$APFULLDIR/srclib/apr-util/xml/expat --enable-static-support"
 VER=`echo $APDIR |sed s/httpd-//`
 TAR="`srclib/apr/build/PrintPath tar`"
 GTAR="`srclib/apr/build/PrintPath gtar`"

diff --git a/config.layout b/config.layout
index 1cab48454de0a2f61ec337b789b4960c680a4831..ba586464c53b1cdb7f44ee3f404ca5872ec16333 100644 (file)
--- a/config.layout
+++ b/config.layout
@@ -60,7 +60,7 @@
 
 #   Apache binary distribution path layout
 <Layout BinaryDistribution>
-    prefix:        /usr/local/apache
+    prefix:        /usr/local/apache2
     exec_prefix:
     bindir:        bin
     sbindir:       bin