Return-Path: Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 26484 invoked by uid 500); 11 Feb 2002 06:01:13 -0000 Mailing-List: contact dev-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 dev@httpd.apache.org Received: (qmail 26465 invoked from network); 11 Feb 2002 06:01:13 -0000 X-Authentication-Warning: localhost.localdomain: dave set sender to dave-ml@dribin.org using -f Date: Sun, 10 Feb 2002 23:57:34 -0600 From: Dave Dribin To: dev@httpd.apache.org Subject: Patch for PR# 4634 Message-ID: <20020211055732.GD16196@afx.dave.dribin.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="envbJBWh7q8WU6mo" Content-Disposition: inline User-Agent: Mutt/1.3.27i X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, I've attached a patch against 1.3.23 that modifies ./configure to take a "--force-suffix" option as a solution to PR# 4634. http://bugs.apache.org/index.cgi/full/4634 This keeps the default behavior as is, but allows people who want to have the additional "httpd" tacked on the directories to do so, even if it is already in an "apache" subdirectory. BTW, for those wondering why this would be useful, I use epkg to install Apache as an encap package. http://www.encap.org/epkg/ The extra "httpd" subdirectories become useful when epkg makes symlinks to the encap directory, such as: /usr/local/etc/httpd/httpd.conf -> ../../encap/apache-1.3.23/etc/httpd/httpd.conf I'd rather keep the files in /usr/local/etc/httpd rather than /usr/local/etc. -Dave --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="apache-layout.patch" diff -uNr apache_1.3.23/configure apache_1.3.23.1/configure --- apache_1.3.23/configure Thu Sep 27 13:12:03 2001 +++ apache_1.3.23.1/configure Tue Feb 5 09:38:37 2002 @@ -237,6 +237,7 @@ # layout configuration with_layout=0 show_layout=0 +force_suffix=0 # suexec defaults suexec=0 @@ -434,6 +435,7 @@ echo " --runtimedir=DIR install runtime data in DIR" echo " --logfiledir=DIR install logfile data in DIR" echo " --proxycachedir=DIR install proxy cache data in DIR" + echo " --force-suffix always use TARGET as a suffix" echo "" echo "Configuration options:" echo " --enable-rule=NAME enable a particular Rule named 'NAME'" @@ -703,6 +705,9 @@ proxycachedir="$apc_optarg" autosuffix_proxycachedir=no ;; + --force-suffix) + force_suffix=1 + ;; --add-module=*) file="$apc_optarg" if [ "x`echo $file | egrep '/?mod_[a-zA-Z0-9][a-zA-Z0-9_]*\.c$'`" = "x" ]; then @@ -1124,10 +1129,14 @@ # still not part of path) eval "autosuffix=\$autosuffix_$var" if [ "x$autosuffix" = "xyes" ]; then - addtarget=no - if [ "x`echo $val | grep apache`" = "x" ]; then - if [ "x`echo $val | grep $thetarget`" = "x" ]; then - addtarget=yes + if [ "x$force_suffix" = "x1" ]; then + addtarget=yes + else + addtarget=no + if [ "x`echo $val | grep apache`" = "x" ]; then + if [ "x`echo $val | grep $thetarget`" = "x" ]; then + addtarget=yes + fi fi fi if [ "x$addtarget" = "xyes" ]; then --envbJBWh7q8WU6mo--