diff options
| author | Marc Slemko <marc@apache.org> | 2001-04-03 19:03:35 +0200 |
|---|---|---|
| committer | Marc Slemko <marc@apache.org> | 2001-04-03 19:03:35 +0200 |
| commit | afe19afd6102db588739a81c6a7fc5b58ca160e6 (patch) | |
| tree | cdcd0e45e95c52874aa71bb17910e90dcc7f77b5 | |
| parent | Uhh, we really need the prototypes for standard string functions. (diff) | |
| download | apache2-afe19afd6102db588739a81c6a7fc5b58ca160e6.tar.xz apache2-afe19afd6102db588739a81c6a7fc5b58ca160e6.zip | |
- 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
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 15 | ||||
| -rw-r--r-- | config.layout | 2 |
4 files changed, 10 insertions, 13 deletions
@@ -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 77e87b2fcd..69bd87a804 100644 --- 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 71a8fed5d0..1dd250ac52 100644 --- 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 2b0d81b0ef..4a55254dea 100644 --- 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 |