There was some discussion earlier about making the default installation
plug everything in below /usr/local/apache2.
I think the below patch does that, plus removes some unnecessary
redundancy and makes the config.layout file be accurate when it says
"Apache layout is the default".
But. I am not too familiar with the apache2 build stuff, so a second
opinion would be appreciated before I commit this...
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
retrieving revision 1.73
diff -u -r1.73 acinclude.m4
--- acinclude.m4 2001/04/02 19:05:59 1.73
+++ acinclude.m4 2001/04/03 03:46:32
@@ -348,16 +348,9 @@
])
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)
Index: config.layout
===================================================================
RCS file: /home/cvs/httpd-2.0/config.layout,v
retrieving revision 1.2
diff -u -r1.2 config.layout
--- config.layout 2000/12/22 11:58:55 1.2
+++ config.layout 2001/04/03 03:46:33
@@ -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
