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

diff --git a/acinclude.m4 b/acinclude.m4
index 728bff454b8e7c3182021977dddd529e59d97ab1..38c5e58698a2276b6483a0eef0ba43d9de17d13b 100644 (file)
--- 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 d43d946a3ec026c421eec9495e4b24cbf83fd5b5..10f1e2bfc8c88c25cb4d7ab9984c078d8e399c79 100644 (file)
--- 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.