diff options
| author | Marc Slemko <marc@apache.org> | 2001-04-04 01:47:39 +0200 |
|---|---|---|
| committer | Marc Slemko <marc@apache.org> | 2001-04-04 01:47:39 +0200 |
| commit | 2918690131405d6dea784dba3401362da1bd320e (patch) | |
| tree | 4ee43be6ed94fdbc97eba6015ebf3760178e0908 /acinclude.m4 | |
| parent | Done. (diff) | |
| download | apache2-2918690131405d6dea784dba3401362da1bd320e.tar.xz apache2-2918690131405d6dea784dba3401362da1bd320e.zip | |
Temporary (hopefully) reversion to the previously used hack to
allow --prefix to work for now. This means that part of the Apache
layout is duplicated in configure.in again.
There are a _LOT_ of inconsistencies in different places about what
items in config.layout are actually used and how they can be set.
Also, change the couple of other things that are necessary to make
/usr/local/apache2 the default prefix when using this way of doing
things.
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88704 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 1dd250ac52..56d962db70 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -329,9 +329,19 @@ AC_ARG_ENABLE(layout, ]) if test -z "$LAYOUT"; then - LAYOUT="Apache" + # XXX FIXME: this isn't a complete list of things that have to be set to + # create the Apache layout in config.layout, and it really should just + # use what is specified in config.layout instead of duping it. + htdocsdir='$(prefix)/htdocs' + iconsdir='$(prefix)/icons' + cgidir='$(prefix)/cgi-bin' + logfiledir='$(prefix)/logs' + sysconfdir='${prefix}/conf' + libexecdir='${prefix}/modules' + layout_name=Apache +else + APACHE_LAYOUT($srcdir/config.layout, $LAYOUT) fi -APACHE_LAYOUT($srcdir/config.layout, $LAYOUT) AC_MSG_CHECKING(for chosen layout) AC_MSG_RESULT($layout_name) |