From ba4156cadd9cdd03d0c94d8a8199f200f327ef6c Mon Sep 17 00:00:00 2001 From: Bradley Nicholes Date: Wed, 31 Jan 2007 23:55:44 +0000 Subject: [PATCH] Implement a BASEDIR build environment variable to allow the NetWare build to relocate the install files Submitted by: Guenter Knauf git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@502051 13f79535-47bb-0310-9956-ffa450edef68 --- NWGNUmakefile | 76 +++++++++++++++--------------- build/NWGNUenvironment.inc | 30 +++++++----- build/mkconfNW.awk | 2 +- modules/aaa/NWGNUmakefile | 2 +- modules/cache/NWGNUmakefile | 2 +- modules/database/NWGNUmakefile | 2 +- modules/dav/fs/NWGNUmakefile | 2 +- modules/dav/lock/NWGNUmakefile | 2 +- modules/dav/main/NWGNUmakefile | 2 +- modules/debugging/NWGNUmakefile | 2 +- modules/echo/NWGNUmakefile | 2 +- modules/experimental/NWGNUmakefile | 2 +- modules/filters/NWGNUdeflate | 2 +- modules/filters/NWGNUmakefile | 2 +- modules/generators/NWGNUmakefile | 2 +- modules/ldap/NWGNUmakefile | 2 +- modules/loggers/NWGNUforensic | 2 +- modules/loggers/NWGNUmakefile | 2 +- modules/loggers/NWGNUmodlogio | 2 +- modules/mappers/NWGNUmakefile | 2 +- modules/metadata/NWGNUmakefile | 2 +- modules/proxy/NWGNUmakefile | 2 +- modules/ssl/NWGNUmakefile | 2 +- support/NWGNUmakefile | 2 +- 24 files changed, 77 insertions(+), 73 deletions(-) diff --git a/NWGNUmakefile b/NWGNUmakefile index e0596b4852..289108c105 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -334,54 +334,54 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index ea3ded6b12..b894d1f732 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -205,6 +205,10 @@ INSTALL = $(AP_WORK)\Dist 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 @@ endif 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 diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk index 9fef967999..cab38801e5 100644 --- a/build/mkconfNW.awk +++ b/build/mkconfNW.awk @@ -15,7 +15,7 @@ BEGIN { - A["ServerRoot"] = "SYS:/APACHE2" + A["ServerRoot"] = "SYS:/"BDIR A["Port"] = "80" A["cgidir"] = "cgi-bin" A["logfiledir"] = "logs" diff --git a/modules/aaa/NWGNUmakefile b/modules/aaa/NWGNUmakefile index b0d0f389c3..f8013237e3 100644 --- a/modules/aaa/NWGNUmakefile +++ b/modules/aaa/NWGNUmakefile @@ -245,7 +245,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/modules/cache/NWGNUmakefile b/modules/cache/NWGNUmakefile index 71d7e1ba20..390f940643 100644 --- a/modules/cache/NWGNUmakefile +++ b/modules/cache/NWGNUmakefile @@ -231,7 +231,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/modules/database/NWGNUmakefile b/modules/database/NWGNUmakefile index eaff833e78..90ed6ee20b 100644 --- a/modules/database/NWGNUmakefile +++ b/modules/database/NWGNUmakefile @@ -249,7 +249,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile index 3e596613fb..fda45fd124 100644 --- a/modules/dav/fs/NWGNUmakefile +++ b/modules/dav/fs/NWGNUmakefile @@ -255,7 +255,7 @@ nlms :: libs $(TARGET_nlm) # 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 # diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile index 6036fab3b8..aa631dc146 100644 --- a/modules/dav/lock/NWGNUmakefile +++ b/modules/dav/lock/NWGNUmakefile @@ -245,7 +245,7 @@ nlms :: libs $(TARGET_nlm) # 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 # diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile index 9fc46c030d..441a6651d5 100644 --- a/modules/dav/main/NWGNUmakefile +++ b/modules/dav/main/NWGNUmakefile @@ -254,7 +254,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/modules/debugging/NWGNUmakefile b/modules/debugging/NWGNUmakefile index 7e3e148601..b9023fba83 100644 --- a/modules/debugging/NWGNUmakefile +++ b/modules/debugging/NWGNUmakefile @@ -231,7 +231,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/modules/echo/NWGNUmakefile b/modules/echo/NWGNUmakefile index d3d40e2814..b6e2efb460 100644 --- a/modules/echo/NWGNUmakefile +++ b/modules/echo/NWGNUmakefile @@ -244,7 +244,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/modules/experimental/NWGNUmakefile b/modules/experimental/NWGNUmakefile index 16af52c8f5..7b35fa4105 100644 --- a/modules/experimental/NWGNUmakefile +++ b/modules/experimental/NWGNUmakefile @@ -238,7 +238,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/modules/filters/NWGNUdeflate b/modules/filters/NWGNUdeflate index 53b4f78910..2288bd629a 100644 --- a/modules/filters/NWGNUdeflate +++ b/modules/filters/NWGNUdeflate @@ -262,7 +262,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/modules/filters/NWGNUmakefile b/modules/filters/NWGNUmakefile index 07600afd49..18df9026a6 100644 --- a/modules/filters/NWGNUmakefile +++ b/modules/filters/NWGNUmakefile @@ -239,7 +239,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/modules/generators/NWGNUmakefile b/modules/generators/NWGNUmakefile index 67d67c4096..1dbf7aa296 100644 --- a/modules/generators/NWGNUmakefile +++ b/modules/generators/NWGNUmakefile @@ -233,7 +233,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/modules/ldap/NWGNUmakefile b/modules/ldap/NWGNUmakefile index 86570695fd..e8a6966634 100644 --- a/modules/ldap/NWGNUmakefile +++ b/modules/ldap/NWGNUmakefile @@ -250,7 +250,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/modules/loggers/NWGNUforensic b/modules/loggers/NWGNUforensic index 58bbbcee43..6ebcd38f04 100644 --- a/modules/loggers/NWGNUforensic +++ b/modules/loggers/NWGNUforensic @@ -244,7 +244,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/modules/loggers/NWGNUmakefile b/modules/loggers/NWGNUmakefile index 9c42c52fd0..f0504acd86 100644 --- a/modules/loggers/NWGNUmakefile +++ b/modules/loggers/NWGNUmakefile @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/modules/loggers/NWGNUmodlogio b/modules/loggers/NWGNUmodlogio index 77f42d52ef..83e0c2c182 100644 --- a/modules/loggers/NWGNUmodlogio +++ b/modules/loggers/NWGNUmodlogio @@ -244,7 +244,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/modules/mappers/NWGNUmakefile b/modules/mappers/NWGNUmakefile index ba7b3903a3..8d284ab369 100644 --- a/modules/mappers/NWGNUmakefile +++ b/modules/mappers/NWGNUmakefile @@ -234,7 +234,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/modules/metadata/NWGNUmakefile b/modules/metadata/NWGNUmakefile index 58d1a19856..07e0dc4778 100644 --- a/modules/metadata/NWGNUmakefile +++ b/modules/metadata/NWGNUmakefile @@ -237,7 +237,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/modules/proxy/NWGNUmakefile b/modules/proxy/NWGNUmakefile index 841673e473..d264698d34 100644 --- a/modules/proxy/NWGNUmakefile +++ b/modules/proxy/NWGNUmakefile @@ -234,7 +234,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/modules/ssl/NWGNUmakefile b/modules/ssl/NWGNUmakefile index 601fda98ab..b357c4eec5 100644 --- a/modules/ssl/NWGNUmakefile +++ b/modules/ssl/NWGNUmakefile @@ -271,7 +271,7 @@ nlms :: libs $(TARGET_nlm) # 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 diff --git a/support/NWGNUmakefile b/support/NWGNUmakefile index b4146215c1..851b6ae71d 100644 --- a/support/NWGNUmakefile +++ b/support/NWGNUmakefile @@ -235,7 +235,7 @@ nlms :: libs $(TARGET_nlm) # 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 -- 2.50.1