summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2002-05-14 16:22:27 +0200
committerJeff Trawick <trawick@apache.org>2002-05-14 16:22:27 +0200
commit19af7c12d6adce9ff5e7b3f27e040e64cf4e15de (patch)
tree292d33522a3934c2ed8dd77516f9c8be60248583
parentfix a comment in config.layout which told the unsuspecting user (diff)
downloadapache2-19af7c12d6adce9ff5e7b3f27e040e64cf4e15de.tar.xz
apache2-19af7c12d6adce9ff5e7b3f27e040e64cf4e15de.zip
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
-rwxr-xr-xbuild/binbuild.sh2
-rw-r--r--config.layout2
2 files changed, 2 insertions, 2 deletions
diff --git a/build/binbuild.sh b/build/binbuild.sh
index 2c3d23a6c8..ebf7efcf7e 100755
--- 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 1cab48454d..ba586464c5 100644
--- 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