- change inconsistent use of logdir and logfiledir all to logfiledir, to

  make the config.layout file work properly.
- change default layout to be "Apache", as defined in config.layout,
  instead of duplicating (some of) that layout in configure itself.
- change default installation path to /usr/local/apache2

PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/CHANGES b/CHANGES
index caa014191045d850c49e8d7d85ae639491f5f46a..169042bc9eeb6773e50f3869519e780f512eff83 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 Changes with Apache 2.0.16-dev
+
+  *) Change the default installation directory to /usr/local/apache2,
+     as now defined by the "Apache" layout in config.layout. [Marc Slemko]
+
   *) OS/2: Added support for building loadable modules as OS/2 DLLs. 
      [Brian Havard]
 

diff --git a/Makefile.in b/Makefile.in
index 77e87b2fcdd28a9337a6d42ebf68bafa60ba66f1..69bd87a8047563d52d2885c58d19430f30945609 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,7 +93,7 @@ install-support:
 
 
 install-other:
-       @test -d $(logdir) || $(MKINSTALLDIRS) $(logdir)
+       @test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
        @for ext in dll x; do \
                file=apachecore.$$ext; \
                if test -f $$file; then \

diff --git a/acinclude.m4 b/acinclude.m4
index 71a8fed5d081b127a5775faf65c1efd86362bb34..1dd250ac52d0cb8c5b91a86a274f477437f365f4 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -40,7 +40,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(bindir)
   APACHE_SUBST(sbindir)
   APACHE_SUBST(cgidir)
-  APACHE_SUBST(logdir)
+  APACHE_SUBST(logfiledir)
   APACHE_SUBST(exec_prefix)
   APACHE_SUBST(datadir)
   APACHE_SUBST(localstatedir)
@@ -291,7 +291,7 @@ AC_DEFUN(APACHE_LAYOUT,[
   rm $pldconf
   for var in prefix exec_prefix bindir sbindir libexecdir mandir \
              sysconfdir datadir iconsdir htdocsdir cgidir includedir \
-             localstatedir runtimedir logdir proxycachedir; do
+             localstatedir runtimedir logfiledir proxycachedir; do
     eval "val=\"\$$var\""
     case $val in
       *+)
@@ -329,16 +329,9 @@ AC_ARG_ENABLE(layout,
 ])
 
 if test -z "$LAYOUT"; then
-  htdocsdir='$(prefix)/htdocs'
-  iconsdir='$(prefix)/icons'
-  cgidir='$(prefix)/cgi-bin'
-  logdir='$(prefix)/logs'
-  sysconfdir='${prefix}/conf'
-  libexecdir='${prefix}/modules'
-  layout_name=Apache
-else  
-  APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
+  LAYOUT="Apache"
 fi
+APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
 
 AC_MSG_CHECKING(for chosen layout)
 AC_MSG_RESULT($layout_name)

diff --git a/config.layout b/config.layout
index 2b0d81b0efdaf2abb5fde78cb590257e65df87d0..4a55254dea837f0330f27e091186bb01cc45ad6a 100644 (file)
--- a/config.layout
+++ b/config.layout
@@ -11,7 +11,7 @@
 
 #   Classical Apache path layout.
 <Layout Apache>
-    prefix:        /usr/local/apache
+    prefix:        /usr/local/apache2
     exec_prefix:   $prefix
     bindir:        $exec_prefix/bin
     sbindir:       $exec_prefix/bin