Implement a BASEDIR build environment variable to allow the NetWare build to relocate...

Submitted by: Guenter Knauf <fuankg apache org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@502051 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/NWGNUmakefile b/NWGNUmakefile
index e0596b4852c93f1e20c9be978cb44e5736d96e4b..289108c105a23036253865cc36e1929788fa7700 100644 (file)
--- 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 ea3ded6b129a29a937d6fedb130244ff2aeb17aa..b894d1f732de682f4f868a4629dbbb9e7c2377ac 100644 (file)
--- 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 9fef967999a16748c068e2ae7fb7bbcc523c68aa..cab38801e501c122cbe3332bc11546a41ae1406a 100644 (file)
--- 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 b0d0f389c38204a6754c04040993ef4e9bce1e44..f8013237e36c8d515a591218aaf973a08928280b 100644 (file)
--- 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 71d7e1ba20f7bd67f8ea6be26ef3cbdb2e224ac1..390f94064309bb873e4973c32ef4547ba0198438 100644 (file)
--- 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 eaff833e78ea0abb60ce37aa45af22819f0eede8..90ed6ee20b713d44cb3d19c35b6e6f5d42569129 100644 (file)
--- 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 3e596613fbc9be1f4344933569e94c97748d23e9..fda45fd12498b424d9c617a63e22063ededa8886 100644 (file)
--- 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 6036fab3b852f3c06c5170893f4661258017c89d..aa631dc146a14211af19e3853632761324a8bc1c 100644 (file)
--- 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 9fc46c030d3ee4d76d61a29d0866aae3f2e0bf39..441a6651d565bf0009900be9c911dc1c64f1e3e8 100644 (file)
--- 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 7e3e148601f5973570b76778fafd4ff4f90c0130..b9023fba832d3e484824f7c243ab79460f01dd8f 100644 (file)
--- 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 d3d40e28143634e16d91cce3acf3808acdd498b1..b6e2efb460613919671b0394a7b1912d4ebca6fc 100644 (file)
--- 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 16af52c8f5d1a283f73cb33584a79190deb56dff..7b35fa4105c302c80c46013c6ab803aa0a0a55c4 100644 (file)
--- 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 53b4f78910873cb31587189bd1fbca0d4b464be5..2288bd629a3ef982ae0712fa8a5bc80975db8785 100644 (file)
--- 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 07600afd490e542233342ca9394af88cfb135738..18df9026a63ed0507337342fec1e6d91ace1894e 100644 (file)
--- 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 67d67c4096d2d401df01cbb96bbec4650f3ca4c5..1dbf7aa296d72fa957039961aec80379050ff258 100644 (file)
--- 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 86570695fdf1d2dc992f34c5ad7b9242b61e7f93..e8a69666344bddd77b71c6b1686d4041cc857d47 100644 (file)
--- 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 58bbbcee43477c8139b835f14d33e9d203169559..6ebcd38f04c9e2a1b37cf155b97ab82c08344ae1 100644 (file)
--- 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 9c42c52fd04b22c67ffa0483b4c8f0f6b623f320..f0504acd86b385ccd054fd3f506a51993000923c 100644 (file)
--- 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 77f42d52ef01a988c54755ee1df4a326db32c852..83e0c2c18273a02e7169ff7753fef2d97cf39fd4 100644 (file)
--- 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 ba7b3903a3e1dfd5ab1ddc7db9cd6c8c48ca314b..8d284ab3692b385efb6e5e50c53b3f7b9765178a 100644 (file)
--- 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 58d1a19856abdd92e08cb8ed848ddaf9eea8e884..07e0dc4778baa6d45893d5d1a1badde5cae92af2 100644 (file)
--- 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 841673e47398fac20fa70475669223f0a112618a..d264698d34c66ef4ed2b27e21dc66c25b782a783 100644 (file)
--- 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 601fda98ab0cf5eac990721bef453779f9554ffd..b357c4eec51c6185e29a47daa444aaacad622a0d 100644 (file)
--- 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 b4146215c16e9dffe9b21a7dd9258f533384c65b..851b6ae71d8100933c1afb6bcff99d89a18bde30 100644 (file)
--- 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