httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/build binbuild.sh
Date Fri, 17 May 2002 14:49:31 GMT
trawick     02/05/17 07:49:31

  Modified:    .        config.layout
               build    binbuild.sh
  Log:
  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
  
  Revision  Changes    Path
  1.20      +0 -24     httpd-2.0/config.layout
  
  Index: config.layout
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/config.layout,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- config.layout	14 May 2002 14:22:27 -0000	1.19
  +++ config.layout	17 May 2002 14:49:30 -0000	1.20
  @@ -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
  
  
  
  1.39      +1 -1      httpd-2.0/build/binbuild.sh
  
  Index: binbuild.sh
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/binbuild.sh,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- binbuild.sh	15 May 2002 17:47:39 -0000	1.38
  +++ binbuild.sh	17 May 2002 14:49:31 -0000	1.39
  @@ -12,7 +12,7 @@
   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`"
  
  
  

Mime
View raw message