From: Jeff Trawick <trawick@apache.org>
Date: Fri, 17 May 2002 14:49:31 +0000 (+0000)
Subject: get binbuild working again, and zap the BinaryDistribution layout
X-Git-Tag: 2.0.37~356
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2455804e947f3c790707c0d9320472273c0f243a;p=apache

get binbuild working again, and zap the BinaryDistribution layout
at the same time

a few days ago the configure syntax for specifying a layout was fixed
in binbuild.sh, but the layout was broken...  it turns out that we
don't need the layout

with Apache 1.3, a separate layout for binary builds was necessary
in order to install under any prefix specified by the user

with Apache 2.0, that works without any special tricks so the
BinaryDistribution layout is no longer necessary


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

diff --git a/build/binbuild.sh b/build/binbuild.sh
index 37bec536b5..bac5603d5d 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="--enable-layout=BinaryDistribution --prefix=$BUILD_DIR --enable-mods-shared=most --with-expat=$APFULLDIR/srclib/apr-util/xml/expat --enable-static-support"
+CONFIGPARAM="--enable-layout=Apache --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 ba586464c5..25b05871f8 100644
--- a/config.layout
+++ b/config.layout
@@ -58,30 +58,6 @@
     proxycachedir: ${localstatedir}/proxy
 </Layout>
 
-#   Apache binary distribution path layout
-<Layout BinaryDistribution>
-    prefix:        /usr/local/apache2
-    exec_prefix:
-    bindir:        bin
-    sbindir:       bin
-    libdir:        lib
-    libexecdir:    libexec
-    mandir:        man
-    sysconfdir:    conf
-    datadir:
-    installbuilddir: build
-    errordir:      error
-    iconsdir:      icons
-    htdocsdir:     htdocs
-    manualdir:     manual
-    cgidir:        cgi-bin
-    includedir:    include
-    localstatedir:
-    runtimedir:    logs
-    logfiledir:    logs
-    proxycachedir: proxy
-</Layout>
-
 #   Mac OS X Server (Rhapsody)
 <Layout Mac OS X Server>
     prefix:        /Local/Library/WebServer