Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 74382 invoked by uid 500); 26 Feb 2002 18:41:59 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 74365 invoked by uid 500); 26 Feb 2002 18:41:58 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 26 Feb 2002 18:41:58 -0000 Message-ID: <20020226184158.30200.qmail@icarus.apache.org> From: aaron@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0 config.layout X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N aaron 02/02/26 10:41:58 Modified: . config.layout Log: These variables need to be delimited with {} or they will conflict with other variables in the same namespace with a shorter prefix substring. How did this ever work before? I ran into this while testing some of the recent layout-fixing patches. Revision Changes Path 1.9 +192 -192 httpd-2.0/config.layout Index: config.layout =================================================================== RCS file: /home/cvs/httpd-2.0/config.layout,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- config.layout 11 Nov 2001 07:02:37 -0000 1.8 +++ config.layout 26 Feb 2002 18:41:58 -0000 1.9 @@ -12,48 +12,48 @@ # Classical Apache path layout. prefix: /usr/local/apache2 - exec_prefix: $prefix - bindir: $exec_prefix/bin - sbindir: $exec_prefix/bin - libexecdir: $exec_prefix/modules - mandir: $prefix/man - sysconfdir: $prefix/conf - datadir: $prefix - installbuilddir: $datadir/build - errordir: $datadir/error - iconsdir: $datadir/icons - htdocsdir: $datadir/htdocs - manualdir: $datadir/manual - cgidir: $datadir/cgi-bin - includedir: $prefix/include - localstatedir: $prefix - runtimedir: $localstatedir/logs - logfiledir: $localstatedir/logs - proxycachedir: $localstatedir/proxy + exec_prefix: ${prefix} + bindir: ${exec_prefix}/bin + sbindir: ${exec_prefix}/bin + libexecdir: ${exec_prefix}/modules + mandir: ${prefix}/man + sysconfdir: ${prefix}/conf + datadir: ${prefix} + installbuilddir: ${datadir}/build + errordir: ${datadir}/error + iconsdir: ${datadir}/icons + htdocsdir: ${datadir}/htdocs + manualdir: ${datadir}/manual + cgidir: ${datadir}/cgi-bin + includedir: ${prefix}/include + localstatedir: ${prefix} + runtimedir: ${localstatedir}/logs + logfiledir: ${localstatedir}/logs + proxycachedir: ${localstatedir}/proxy # GNU standards conforming path layout. # See FSF's GNU project `make-stds' document for details. prefix: /usr/local - exec_prefix: $prefix - bindir: $exec_prefix/bin - sbindir: $exec_prefix/sbin - libexecdir: $exec_prefix/libexec - mandir: $prefix/man - sysconfdir: $prefix/etc+ - datadir: $prefix/share+ - installbuilddir: $datadir/build - errordir: $datadir/error - iconsdir: $datadir/icons - htdocsdir: $datadir/htdocs - manualdir: $datadir/manual - cgidir: $datadir/cgi-bin - includedir: $prefix/include+ - localstatedir: $prefix/var+ - runtimedir: $localstatedir/run - logfiledir: $localstatedir/log - proxycachedir: $localstatedir/proxy + exec_prefix: ${prefix} + bindir: ${exec_prefix}/bin + sbindir: ${exec_prefix}/sbin + libexecdir: ${exec_prefix}/libexec + mandir: ${prefix}/man + sysconfdir: ${prefix}/etc+ + datadir: ${prefix}/share+ + installbuilddir: ${datadir}/build + errordir: ${datadir}/error + iconsdir: ${datadir}/icons + htdocsdir: ${datadir}/htdocs + manualdir: ${datadir}/manual + cgidir: ${datadir}/cgi-bin + includedir: ${prefix}/include+ + localstatedir: ${prefix}/var+ + runtimedir: ${localstatedir}/run + logfiledir: ${localstatedir}/log + proxycachedir: ${localstatedir}/proxy # Apache binary distribution path layout @@ -83,227 +83,227 @@ prefix: /Local/Library/WebServer exec_prefix: /usr - bindir: $exec_prefix/bin - sbindir: $exec_prefix/sbin + bindir: ${exec_prefix}/bin + sbindir: ${exec_prefix}/sbin libexecdir: /System/Library/Apache/Modules - mandir: $exec_prefix/share/man - sysconfdir: $prefix/Configuration - datadir: $prefix + mandir: ${exec_prefix}/share/man + sysconfdir: ${prefix}/Configuration + datadir: ${prefix} installbuilddir: /System/Library/Apache/Build errordir: /System/Library/Apache/Error iconsdir: /System/Library/Apache/Icons manualdir: /System/Library/Apache/Manual - htdocsdir: $datadir/Documents - cgidir: $datadir/CGI-Executables + htdocsdir: ${datadir}/Documents + cgidir: ${datadir}/CGI-Executables includedir: /System/Library/Frameworks/Apache.framework/Versions/1.3/Headers localstatedir: /var - runtimedir: $prefix/Logs - logfiledir: $prefix/Logs - proxycachedir: $prefix/ProxyCache + runtimedir: ${prefix}/Logs + logfiledir: ${prefix}/Logs + proxycachedir: ${prefix}/ProxyCache # Darwin/Mac OS Layout prefix: /usr - exec_prefix: $prefix - bindir: $exec_prefix/bin - sbindir: $exec_prefix/sbin - libexecdir: $exec_prefix/libexec+ - mandir: $prefix/share/man + exec_prefix: ${prefix} + bindir: ${exec_prefix}/bin + sbindir: ${exec_prefix}/sbin + libexecdir: ${exec_prefix}/libexec+ + mandir: ${prefix}/share/man datadir: /Library/WebServer sysconfdir: /etc+ - installbuilddir: $prefix/share/httpd/build - errordir: $prefix/share/httpd/error - iconsdir: $prefix/share/httpd/icons - htdocsdir: $datadir/Documents - manualdir: $datadir/share/httpd/manual - cgidir: $datadir/CGI-Executables - includedir: $prefix/include+ + installbuilddir: ${prefix}/share/httpd/build + errordir: ${prefix}/share/httpd/error + iconsdir: ${prefix}/share/httpd/icons + htdocsdir: ${datadir}/Documents + manualdir: ${datadir}/share/httpd/manual + cgidir: ${datadir}/CGI-Executables + includedir: ${prefix}/include+ localstatedir: /var - runtimedir: $localstatedir/run - logfiledir: $localstatedir/log+ - proxycachedir: $runtimedir/proxy + runtimedir: ${localstatedir}/run + logfiledir: ${localstatedir}/log+ + proxycachedir: ${runtimedir}/proxy # RedHat 5.x layout prefix: /usr - exec_prefix: $prefix - bindir: $prefix/bin - sbindir: $prefix/sbin - libexecdir: $prefix/lib/apache - mandir: $prefix/man + exec_prefix: ${prefix} + bindir: ${prefix}/bin + sbindir: ${prefix}/sbin + libexecdir: ${prefix}/lib/apache + mandir: ${prefix}/man sysconfdir: /etc/httpd/conf datadir: /home/httpd - installbuilddir: $datadir/build - errordir: $datadir/error - iconsdir: $datadir/icons - htdocsdir: $datadir/html - manualdir: $datadir/manual - cgidir: $datadir/cgi-bin - includedir: $prefix/include/apache + installbuilddir: ${datadir}/build + errordir: ${datadir}/error + iconsdir: ${datadir}/icons + htdocsdir: ${datadir}/html + manualdir: ${datadir}/manual + cgidir: ${datadir}/cgi-bin + includedir: ${prefix}/include/apache localstatedir: /var - runtimedir: $localstatedir/run - logfiledir: $localstatedir/log/httpd - proxycachedir: $localstatedir/cache/httpd + runtimedir: ${localstatedir}/run + logfiledir: ${localstatedir}/log/httpd + proxycachedir: ${localstatedir}/cache/httpd # According to the /opt filesystem conventions prefix: /opt/apache - exec_prefix: $prefix - bindir: $exec_prefix/bin - sbindir: $exec_prefix/sbin - libexecdir: $exec_prefix/libexec - mandir: $prefix/man - sysconfdir: /etc$prefix - datadir: $prefix/share - installbuilddir: $datadir/build - errordir: $datadir/error - iconsdir: $datadir/icons - htdocsdir: $datadir/htdocs - manualdir: $datadir/manual - cgidir: $datadir/cgi-bin - includedir: $prefix/include - localstatedir: /var$prefix - runtimedir: $localstatedir/run - logfiledir: $localstatedir/logs - proxycachedir: $localstatedir/proxy + exec_prefix: ${prefix} + bindir: ${exec_prefix}/bin + sbindir: ${exec_prefix}/sbin + libexecdir: ${exec_prefix}/libexec + mandir: ${prefix}/man + sysconfdir: /etc${prefix} + datadir: ${prefix}/share + installbuilddir: ${datadir}/build + errordir: ${datadir}/error + iconsdir: ${datadir}/icons + htdocsdir: ${datadir}/htdocs + manualdir: ${datadir}/manual + cgidir: ${datadir}/cgi-bin + includedir: ${prefix}/include + localstatedir: /var${prefix} + runtimedir: ${localstatedir}/run + logfiledir: ${localstatedir}/logs + proxycachedir: ${localstatedir}/proxy # BeOS layout... prefix: /boot/home/apache - exec_prefix: $prefix - bindir: $exec_prefix/bin - sbindir: $exec_prefix/bin - libexecdir: $exec_prefix/libexec - mandir: $prefix/man - sysconfdir: $prefix/conf - datadir: $prefix - installbuilddir: $datadir/build - errordir: $datadir/error - iconsdir: $datadir/icons - htdocsdir: $datadir/htdocs - manualdir: $datadir/manual - cgidir: $datadir/cgi-bin - includedir: $prefix/include - localstatedir: $prefix - runtimedir: $localstatedir/logs - logfiledir: $localstatedir/logs - proxycachedir: $localstatedir/proxy + exec_prefix: ${prefix} + bindir: ${exec_prefix}/bin + sbindir: ${exec_prefix}/bin + libexecdir: ${exec_prefix}/libexec + mandir: ${prefix}/man + sysconfdir: ${prefix}/conf + datadir: ${prefix} + installbuilddir: ${datadir}/build + errordir: ${datadir}/error + iconsdir: ${datadir}/icons + htdocsdir: ${datadir}/htdocs + manualdir: ${datadir}/manual + cgidir: ${datadir}/cgi-bin + includedir: ${prefix}/include + localstatedir: ${prefix} + runtimedir: ${localstatedir}/logs + logfiledir: ${localstatedir}/logs + proxycachedir: ${localstatedir}/proxy # SuSE 6.x layout prefix: /usr - exec_prefix: $prefix - bindir: $prefix/bin - sbindir: $prefix/sbin - libexecdir: $prefix/lib/apache - mandir: $prefix/man + exec_prefix: ${prefix} + bindir: ${prefix}/bin + sbindir: ${prefix}/sbin + libexecdir: ${prefix}/lib/apache + mandir: ${prefix}/man sysconfdir: /etc/httpd datadir: /usr/local/httpd - installbuilddir: $datadir/build - errordir: $datadir/error - iconsdir: $datadir/icons - htdocsdir: $datadir/htdocs - manualdir: $datadir/manual - cgidir: $datadir/cgi-bin - includedir: $prefix/include/apache + installbuilddir: ${datadir}/build + errordir: ${datadir}/error + iconsdir: ${datadir}/icons + htdocsdir: ${datadir}/htdocs + manualdir: ${datadir}/manual + cgidir: ${datadir}/cgi-bin + includedir: ${prefix}/include/apache localstatedir: /var - runtimedir: $localstatedir/run - logfiledir: $localstatedir/log/httpd - proxycachedir: $localstatedir/cache/httpd + runtimedir: ${localstatedir}/run + logfiledir: ${localstatedir}/log/httpd + proxycachedir: ${localstatedir}/cache/httpd # BSD/OS layout prefix: /var/www exec_prefix: /usr/contrib - bindir: $exec_prefix/bin - sbindir: $exec_prefix/bin - libexecdir: $exec_prefix/libexec/apache - mandir: $exec_prefix/man - sysconfdir: $prefix/conf - datadir: $prefix - installbuilddir: $datadir/build - errordir: $datadir/error - iconsdir: $datadir/icons - htdocsdir: $datadir/htdocs - manualdir: $datadir/manual - cgidir: $datadir/cgi-bin - includedir: $exec_prefix/include/apache + bindir: ${exec_prefix}/bin + sbindir: ${exec_prefix}/bin + libexecdir: ${exec_prefix}/libexec/apache + mandir: ${exec_prefix}/man + sysconfdir: ${prefix}/conf + datadir: ${prefix} + installbuilddir: ${datadir}/build + errordir: ${datadir}/error + iconsdir: ${datadir}/icons + htdocsdir: ${datadir}/htdocs + manualdir: ${datadir}/manual + cgidir: ${datadir}/cgi-bin + includedir: ${exec_prefix}/include/apache localstatedir: /var - runtimedir: $localstatedir/run - logfiledir: $localstatedir/log/httpd - proxycachedir: $localstatedir/proxy + runtimedir: ${localstatedir}/run + logfiledir: ${localstatedir}/log/httpd + proxycachedir: ${localstatedir}/proxy # Solaris 8 Layout prefix: /usr/apache - exec_prefix: $prefix - bindir: $exec_prefix/bin - sbindir: $exec_prefix/bin - libexecdir: $exec_prefix/libexec - mandir: $exec_prefix/man + exec_prefix: ${prefix} + bindir: ${exec_prefix}/bin + sbindir: ${exec_prefix}/bin + libexecdir: ${exec_prefix}/libexec + mandir: ${exec_prefix}/man sysconfdir: /etc/apache datadir: /var/apache - installbuilddir: $datadir/build - errordir: $datadir/error - iconsdir: $datadir/icons - htdocsdir: $datadir/htdocs - manualdir: $datadir/manual - cgidir: $datadir/cgi-bin - includedir: $exec_prefix/include - localstatedir: $prefix + installbuilddir: ${datadir}/build + errordir: ${datadir}/error + iconsdir: ${datadir}/icons + htdocsdir: ${datadir}/htdocs + manualdir: ${datadir}/manual + cgidir: ${datadir}/cgi-bin + includedir: ${exec_prefix}/include + localstatedir: ${prefix} runtimedir: /var/run - logfiledir: $datadir/logs - proxycachedir: $datadir/proxy + logfiledir: ${datadir}/logs + proxycachedir: ${datadir}/proxy # OpenBSD Layout prefix: /var/www exec_prefix: /usr - bindir: $exec_prefix/bin - sbindir: $exec_prefix/sbin - libexecdir: $exec_prefix/lib/apache/modules - mandir: $exec_prefix/share/man - sysconfdir: $prefix/conf - datadir: $prefix - installbuilddir: $prefix/build - errordir: $prefix/error - iconsdir: $prefix/icons - htdocsdir: $prefix/htdocs - manualdir: $datadir/manual - cgidir: $prefix/cgi-bin - includedir: $exec_prefix/lib/apache/include - localstatedir: $prefix - runtimedir: $prefix/logs - logfiledir: $prefix/logs - proxycachedir: $prefix/proxy + bindir: ${exec_prefix}/bin + sbindir: ${exec_prefix}/sbin + libexecdir: ${exec_prefix}/lib/apache/modules + mandir: ${exec_prefix}/share/man + sysconfdir: ${prefix}/conf + datadir: ${prefix} + installbuilddir: ${prefix}/build + errordir: ${prefix}/error + iconsdir: ${prefix}/icons + htdocsdir: ${prefix}/htdocs + manualdir: ${datadir}/manual + cgidir: ${prefix}/cgi-bin + includedir: ${exec_prefix}/lib/apache/include + localstatedir: ${prefix} + runtimedir: ${prefix}/logs + logfiledir: ${prefix}/logs + proxycachedir: ${prefix}/proxy # Debian layout prefix: - exec_prefix: $prefix/usr - bindir: $exec_prefix/bin - sbindir: $exec_prefix/sbin - libexecdir: $exec_prefix/lib/apache2/modules - mandir: $exec_prefix/share/man - sysconfdir: $prefix/etc/apache2 - datadir: $exec_prefix/share/apache2 - iconsdir: $datadir/icons - htdocsdir: $prefix/usr/share/apache2/default-site/htdocs - cgidir: $prefix/usr/lib/cgi-bin - includedir: $exec_prefix/include/apache2 - localstatedir: $prefix/var/run - runtimedir: $prefix/var/run - logfiledir: $prefix/var/log/apache2 - proxycachedir: $prefix/var/cache/apache2/proxy - infodir: $exec_prefix/share/info - installbuilddir: $prefix/etc/apache2/build + exec_prefix: ${prefix}/usr + bindir: ${exec_prefix}/bin + sbindir: ${exec_prefix}/sbin + libexecdir: ${exec_prefix}/lib/apache2/modules + mandir: ${exec_prefix}/share/man + sysconfdir: ${prefix}/etc/apache2 + datadir: ${exec_prefix}/share/apache2 + iconsdir: ${datadir}/icons + htdocsdir: ${prefix}/usr/share/apache2/default-site/htdocs + cgidir: ${prefix}/usr/lib/cgi-bin + includedir: ${exec_prefix}/include/apache2 + localstatedir: ${prefix}/var/run + runtimedir: ${prefix}/var/run + logfiledir: ${prefix}/var/log/apache2 + proxycachedir: ${prefix}/var/cache/apache2/proxy + infodir: ${exec_prefix}/share/info + installbuilddir: ${prefix}/etc/apache2/build