Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 49616 invoked from network); 9 Feb 2007 23:59:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Feb 2007 23:59:39 -0000 Received: (qmail 84654 invoked by uid 500); 9 Feb 2007 23:59:46 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 84602 invoked by uid 500); 9 Feb 2007 23:59:46 -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: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 84553 invoked by uid 99); 9 Feb 2007 23:59:46 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Feb 2007 15:59:46 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Feb 2007 15:59:37 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 7121B1A981F; Fri, 9 Feb 2007 15:59:17 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r505572 - in /httpd/httpd/branches/2.2.x: ./ build/ modules/aaa/ modules/cache/ modules/database/ modules/dav/fs/ modules/dav/lock/ modules/dav/main/ modules/debug/ modules/echo/ modules/experimental/ modules/filters/ modules/generators/ mo... Date: Fri, 09 Feb 2007 23:59:16 -0000 To: cvs@httpd.apache.org From: bnicholes@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070209235917.7121B1A981F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bnicholes Date: Fri Feb 9 15:59:15 2007 New Revision: 505572 URL: http://svn.apache.org/viewvc?view=rev&rev=505572 Log: Implement a BASEDIR build environment variable to allow the NetWare build to relocate the install files Submitted by: Guenter Knauf Modified: httpd/httpd/branches/2.2.x/NWGNUmakefile httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc httpd/httpd/branches/2.2.x/build/mkconfNW.awk httpd/httpd/branches/2.2.x/modules/aaa/NWGNUmakefile httpd/httpd/branches/2.2.x/modules/cache/NWGNUmakefile httpd/httpd/branches/2.2.x/modules/database/NWGNUmakefile httpd/httpd/branches/2.2.x/modules/dav/fs/NWGNUmakefile httpd/httpd/branches/2.2.x/modules/dav/lock/NWGNUmakefile httpd/httpd/branches/2.2.x/modules/dav/main/NWGNUmakefile httpd/httpd/branches/2.2.x/modules/debug/NWGNUmakefile httpd/httpd/branches/2.2.x/modules/echo/NWGNUmakefile httpd/httpd/branches/2.2.x/modules/experimental/NWGNUmakefile httpd/httpd/branches/2.2.x/modules/filters/NWGNUdeflate httpd/httpd/branches/2.2.x/modules/filters/NWGNUmakefile httpd/httpd/branches/2.2.x/modules/generators/NWGNUmakefile httpd/httpd/branches/2.2.x/modules/ldap/NWGNUmakefile httpd/httpd/branches/2.2.x/modules/loggers/NWGNUforensic httpd/httpd/branches/2.2.x/modules/loggers/NWGNUmakefile httpd/httpd/branches/2.2.x/modules/loggers/NWGNUmodlogio httpd/httpd/branches/2.2.x/modules/mappers/NWGNUmakefile httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmakefile httpd/httpd/branches/2.2.x/modules/proxy/NWGNUmakefile httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile httpd/httpd/branches/2.2.x/support/NWGNUmakefile Modified: httpd/httpd/branches/2.2.x/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -327,54 +327,54 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - -copy $(OBJDIR)\Apache2.nlm $(INSTALL)\Apache2\*.* - -copy ABOUT_APACHE $(INSTALL)\Apache2\*.* - -copy README $(INSTALL)\Apache2\*.* - -copy STATUS $(INSTALL)\Apache2\*.* - -copy LICENSE $(INSTALL)\Apache2\*.* - -copy CHANGES $(INSTALL)\Apache2\*.* - -copy support\dbmmanage.in $(INSTALL)\Apache2\bin\dbmmanage.pl - -copy support\logresolve.pl.in $(INSTALL)\Apache2\bin\logresolve.pl + -copy $(OBJDIR)\Apache2.nlm $(INSTALL)\$(BASEDIR)\*.* + -copy ABOUT_APACHE $(INSTALL)\$(BASEDIR)\*.* + -copy README $(INSTALL)\$(BASEDIR)\*.* + -copy STATUS $(INSTALL)\$(BASEDIR)\*.* + -copy LICENSE $(INSTALL)\$(BASEDIR)\*.* + -copy CHANGES $(INSTALL)\$(BASEDIR)\*.* + -copy support\dbmmanage.in $(INSTALL)\$(BASEDIR)\bin\dbmmanage.pl + -copy support\logresolve.pl.in $(INSTALL)\$(BASEDIR)\bin\logresolve.pl ifdef USE_STDSOCKETS - -awk -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\Apache2\conf\httpd.conf + -awk -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf else - -awk -v SSL=1 -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\Apache2\conf\httpd.conf + -awk -v BDIR=$(BASEDIR) -v SSL=1 -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf endif - $(CHKNOT) $(INSTALL)\Apache2\conf\extra\nul mkdir $(INSTALL)\Apache2\conf\extra - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-autoindex.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-autoindex.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-dav.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-dav.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-default.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-default.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-info.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-info.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-languages.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-languages.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-manual.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-manual.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-mpm.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-mpm.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-multilang-errordoc.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-multilang-errordoc.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-ssl.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-ssl.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-userdir.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-userdir.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-vhosts.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-vhosts.conf - -copy docs\conf\magic $(INSTALL)\Apache2\conf\magic - -copy docs\conf\mime.types $(INSTALL)\Apache2\conf\mime.types - -copy docs\conf\charset.conv $(INSTALL)\Apache2\conf\charset.conv - -copy docs\cgi-examples\printenv $(INSTALL)\Apache2\cgi-bin\printenv.pl + $(CHKNOT) $(INSTALL)\$(BASEDIR)\conf\extra\nul mkdir $(INSTALL)\$(BASEDIR)\conf\extra + -awk -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-autoindex.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-autoindex.conf + -awk -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-dav.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-dav.conf + -awk -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-default.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-default.conf + -awk -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-info.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-info.conf + -awk -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-languages.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-languages.conf + -awk -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-manual.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-manual.conf + -awk -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-mpm.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-mpm.conf + -awk -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-multilang-errordoc.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-multilang-errordoc.conf + -awk -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-ssl.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-ssl.conf + -awk -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-userdir.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-userdir.conf + -awk -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-vhosts.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-vhosts.conf + -copy docs\conf\magic $(INSTALL)\$(BASEDIR)\conf\magic + -copy docs\conf\mime.types $(INSTALL)\$(BASEDIR)\conf\mime.types + -copy docs\conf\charset.conv $(INSTALL)\$(BASEDIR)\conf\charset.conv + -copy docs\cgi-examples\printenv $(INSTALL)\$(BASEDIR)\cgi-bin\printenv.pl @echo rem copying the docs directories > xc.bat - @echo xcopy docs\error $(INSTALL)\Apache2\error $(XCOPYSW) >> xc.bat - @echo xcopy docs\docroot $(INSTALL)\Apache2\htdocs $(XCOPYSW) >> xc.bat - @echo xcopy docs\icons $(INSTALL)\Apache2\icons $(XCOPYSW) >> xc.bat - @echo xcopy docs\man $(INSTALL)\Apache2\man $(XCOPYSW) >> xc.bat - @echo xcopy docs\manual $(INSTALL)\Apache2\manual $(XCOPYSW) >> xc.bat + @echo xcopy docs\error $(INSTALL)\$(BASEDIR)\error $(XCOPYSW) >> xc.bat + @echo xcopy docs\docroot $(INSTALL)\$(BASEDIR)\htdocs $(XCOPYSW) >> xc.bat + @echo xcopy docs\icons $(INSTALL)\$(BASEDIR)\icons $(XCOPYSW) >> xc.bat + @echo xcopy docs\man $(INSTALL)\$(BASEDIR)\man $(XCOPYSW) >> xc.bat + @echo xcopy docs\manual $(INSTALL)\$(BASEDIR)\manual $(XCOPYSW) >> xc.bat $(CMD) xc.bat $(DEL) xc.bat installdev :: FORCE - -copy $(subst /,\,$(AP_WORK))\include\*.h $(INSTALL)\Apache2\include\*.* - -copy $(subst /,\,$(AP_WORK))\os\netware\*.h $(INSTALL)\Apache2\include\*.* - -copy $(subst /,\,$(NWOS))\*.imp $(INSTALL)\Apache2\lib\*.* - -copy $(subst /,\,$(APR))\include\*.h $(INSTALL)\Apache2\include\*.* - -copy $(subst /,\,$(APRUTIL))\include\*.h $(INSTALL)\Apache2\include\*.* - -copy $(subst /,\,$(APR))\*.imp $(INSTALL)\Apache2\lib\*.* - -copy $(subst /,\,$(NWOS))\*.xdc $(INSTALL)\Apache2\lib\*.* + -copy $(subst /,\,$(AP_WORK))\include\*.h $(INSTALL)\$(BASEDIR)\include\*.* + -copy $(subst /,\,$(AP_WORK))\os\netware\*.h $(INSTALL)\$(BASEDIR)\include\*.* + -copy $(subst /,\,$(NWOS))\*.imp $(INSTALL)\$(BASEDIR)\lib\*.* + -copy $(subst /,\,$(APR))\include\*.h $(INSTALL)\$(BASEDIR)\include\*.* + -copy $(subst /,\,$(APRUTIL))\include\*.h $(INSTALL)\$(BASEDIR)\include\*.* + -copy $(subst /,\,$(APR))\*.imp $(INSTALL)\$(BASEDIR)\lib\*.* + -copy $(subst /,\,$(NWOS))\*.xdc $(INSTALL)\$(BASEDIR)\lib\*.* prebuild :: FORCE $(MAKE) -C server -f NWGNUMakefile Modified: httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc (original) +++ httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc Fri Feb 9 15:59:15 2007 @@ -205,6 +205,10 @@ INSTDIRS = $(AP_WORK)\Dist endif +ifndef BASEDIR +BASEDIR = Apache2 +endif + # Add support for building IPV6 alongside ifneq "$(IPV6)" "" DEFINES += -DNW_BUILD_IPV6 @@ -226,21 +230,21 @@ INSTDEVDIRS := \ $(INSTDIRS) \ - $(INSTALL)\Apache2\include \ - $(INSTALL)\Apache2\lib \ + $(INSTALL)\$(BASEDIR)\include \ + $(INSTALL)\$(BASEDIR)\lib \ INSTDIRS += \ - $(INSTALL)\Apache2 \ - $(INSTALL)\Apache2\bin \ - $(INSTALL)\Apache2\cgi-bin \ - $(INSTALL)\Apache2\conf \ - $(INSTALL)\Apache2\error \ - $(INSTALL)\Apache2\htdocs \ - $(INSTALL)\Apache2\icons \ - $(INSTALL)\Apache2\logs \ - $(INSTALL)\Apache2\man \ - $(INSTALL)\Apache2\manual \ - $(INSTALL)\Apache2\modules \ + $(INSTALL)\$(BASEDIR) \ + $(INSTALL)\$(BASEDIR)\bin \ + $(INSTALL)\$(BASEDIR)\cgi-bin \ + $(INSTALL)\$(BASEDIR)\conf \ + $(INSTALL)\$(BASEDIR)\error \ + $(INSTALL)\$(BASEDIR)\htdocs \ + $(INSTALL)\$(BASEDIR)\icons \ + $(INSTALL)\$(BASEDIR)\logs \ + $(INSTALL)\$(BASEDIR)\man \ + $(INSTALL)\$(BASEDIR)\manual \ + $(INSTALL)\$(BASEDIR)\modules \ # # Declare Command and tool macros here Modified: httpd/httpd/branches/2.2.x/build/mkconfNW.awk URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/mkconfNW.awk?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/build/mkconfNW.awk (original) +++ httpd/httpd/branches/2.2.x/build/mkconfNW.awk Fri Feb 9 15:59:15 2007 @@ -15,7 +15,7 @@ BEGIN { - A["ServerRoot"] = "SYS:/APACHE2" + A["ServerRoot"] = "SYS:/"BDIR A["Port"] = "80" A["cgidir"] = "cgi-bin" A["logfiledir"] = "logs" Modified: httpd/httpd/branches/2.2.x/modules/aaa/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/aaa/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/modules/aaa/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -247,7 +247,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/modules/cache/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/cache/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/cache/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/modules/cache/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -231,7 +231,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/modules/database/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/database/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/database/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/modules/database/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -249,7 +249,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/modules/dav/fs/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/dav/fs/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/dav/fs/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/modules/dav/fs/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -255,7 +255,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\moddavfs.nlm $(INSTALL)\Apache2\modules + copy $(OBJDIR)\moddavfs.nlm $(INSTALL)\$(BASEDIR)\modules # # Any specialized rules here # Modified: httpd/httpd/branches/2.2.x/modules/dav/lock/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/dav/lock/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/dav/lock/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/modules/dav/lock/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -245,7 +245,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\moddavlk.nlm $(INSTALL)\Apache2\modules + copy $(OBJDIR)\moddavlk.nlm $(INSTALL)\$(BASEDIR)\modules # # Any specialized rules here # Modified: httpd/httpd/branches/2.2.x/modules/dav/main/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/dav/main/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/dav/main/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/modules/dav/main/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -254,7 +254,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\mod_dav.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\mod_dav.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/modules/debug/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/debug/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/debug/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/modules/debug/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -231,7 +231,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/modules/echo/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/echo/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/echo/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/modules/echo/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -244,7 +244,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/modules/experimental/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/experimental/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/experimental/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/modules/experimental/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -238,7 +238,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/modules/filters/NWGNUdeflate URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/filters/NWGNUdeflate?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/filters/NWGNUdeflate (original) +++ httpd/httpd/branches/2.2.x/modules/filters/NWGNUdeflate Fri Feb 9 15:59:15 2007 @@ -262,7 +262,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/modules/filters/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/filters/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/filters/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/modules/filters/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -239,7 +239,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/modules/generators/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/generators/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/generators/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/modules/generators/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -233,7 +233,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/modules/ldap/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ldap/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/ldap/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/modules/ldap/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -250,7 +250,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/modules/loggers/NWGNUforensic URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/loggers/NWGNUforensic?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/loggers/NWGNUforensic (original) +++ httpd/httpd/branches/2.2.x/modules/loggers/NWGNUforensic Fri Feb 9 15:59:15 2007 @@ -244,7 +244,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/modules/loggers/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/loggers/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/loggers/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/modules/loggers/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -230,7 +230,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/modules/loggers/NWGNUmodlogio URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/loggers/NWGNUmodlogio?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/loggers/NWGNUmodlogio (original) +++ httpd/httpd/branches/2.2.x/modules/loggers/NWGNUmodlogio Fri Feb 9 15:59:15 2007 @@ -244,7 +244,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/modules/mappers/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/mappers/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/mappers/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/modules/mappers/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -234,7 +234,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -237,7 +237,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/modules/proxy/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/proxy/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/modules/proxy/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -234,7 +234,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -271,7 +271,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\mod_ssl.nlm $(INSTALL)\Apache2\modules\*.* + copy $(OBJDIR)\mod_ssl.nlm $(INSTALL)\$(BASEDIR)\modules\*.* # # Any specialized rules here Modified: httpd/httpd/branches/2.2.x/support/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/support/NWGNUmakefile?view=diff&rev=505572&r1=505571&r2=505572 ============================================================================== --- httpd/httpd/branches/2.2.x/support/NWGNUmakefile (original) +++ httpd/httpd/branches/2.2.x/support/NWGNUmakefile Fri Feb 9 15:59:15 2007 @@ -235,7 +235,7 @@ # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\bin\*.* + copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\bin\*.* # # Any specialized rules here