summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Bannert <aaron@apache.org>2002-03-14 18:18:33 +0100
committerAaron Bannert <aaron@apache.org>2002-03-14 18:18:33 +0100
commit4a86a96acc9365b585344d8b45261a5c0ce8b168 (patch)
treefb7528b6a01910c4365c8d952e42c040ebf3f860
parentSwitched to the new winsock header for NetWare (diff)
downloadapache2-4a86a96acc9365b585344d8b45261a5c0ce8b168.tar.xz
apache2-4a86a96acc9365b585344d8b45261a5c0ce8b168.zip
Fix a comment about the /<target> appended to config.layout variables
postpended with a '+' character. We don't currently support --target (and as Thom pointed out, --target means something completely different to Autoconf). Also change the default for '+' replacement to 'apache2' so 1.3 and 2.0 can coexist on such distributions. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93936 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--acinclude.m42
-rw-r--r--config.layout4
2 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 728bff454b..38c5e58698 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -341,7 +341,7 @@ AC_DEFUN(APACHE_LAYOUT,[
addtarget=yes
fi
if test "$addtarget" = "yes"; then
- val="$val/apache"
+ val="$val/apache2"
fi
fi
eval "$var='$val'"
diff --git a/config.layout b/config.layout
index d43d946a3e..10f1e2bfc8 100644
--- a/config.layout
+++ b/config.layout
@@ -5,8 +5,8 @@
## - layouts can be loaded with configure's --with-layout=ID option
## - when no --with-layout option is given, the default layout is `Apache'
## - a trailing plus character (`+') on paths is replaced with a
-## `/<target>' suffix where <target> is the the argument from
-## option --target (defaults to `httpd').
+## `/<target>' suffix where <target> is currently hardcoded to 'apache2'.
+## (This may become a configurable parameter at some point.)
##
# Classical Apache path layout.