Use a var INSTALLBASE to simplify NetWare installation rules.

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

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 27fc085f0d94ee83263920e18ee55418725d8f07..ed67eb71b6b8d9be715252111328a175b81d6115 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -392,61 +392,61 @@ nlms :: libs $(TARGET_nlm)
 MKCNF  = $(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build/mkconfNW.awk $1 > $2
 
 install :: nlms instscripts FORCE
-       $(call COPY,$(OBJDIR)/$(NLM_NAME).nlm,   $(INSTALL)/$(BASEDIR)/)
-       $(call COPY,ABOUT_APACHE,                $(INSTALL)/$(BASEDIR)/)
-       $(call COPY,CHANGES,                     $(INSTALL)/$(BASEDIR)/)
-       $(call COPY,LICENSE,                     $(INSTALL)/$(BASEDIR)/)
-       $(call COPY,README,                      $(INSTALL)/$(BASEDIR)/)
-       $(call COPY,VERSIONING,                  $(INSTALL)/$(BASEDIR)/)
-       $(call COPY,STATUS,                      $(INSTALL)/$(BASEDIR)/)
-       $(call COPY,support/dbmmanage.in,        $(INSTALL)/$(BASEDIR)/bin/dbmmanage.pl)
-       $(call COPY,support/logresolve.pl.in,    $(INSTALL)/$(BASEDIR)/bin/logresolve.pl)
-       $(call COPY,support/split-logfile.in,    $(INSTALL)/$(BASEDIR)/bin/split-logfile.pl)
-       $(call COPY,support/check_forensic,      $(INSTALL)/$(BASEDIR)/bin/check_forensic.sh)
-       $(call COPY,docs/conf/magic,             $(INSTALL)/$(BASEDIR)/conf/)
-       $(call COPY,docs/conf/mime.types,        $(INSTALL)/$(BASEDIR)/conf/)
-       $(call COPY,docs/conf/charset.conv,      $(INSTALL)/$(BASEDIR)/conf/)
-       $(call COPY,docs/cgi-examples/printenv,  $(INSTALL)/$(BASEDIR)/cgi-bin/printenv.pl)
-       $(call MKCNF,docs/conf/httpd.conf.in,    $(INSTALL)/$(BASEDIR)/conf/httpd.conf)
-       $(call MKCNF,docs/conf/extra/httpd-autoindex.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-autoindex.conf)
-       $(call MKCNF,docs/conf/extra/httpd-dav.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-dav.conf)
-       $(call MKCNF,docs/conf/extra/httpd-default.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-default.conf)
-       $(call MKCNF,docs/conf/extra/httpd-info.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-info.conf)
-       $(call MKCNF,docs/conf/extra/httpd-languages.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-languages.conf)
-       $(call MKCNF,docs/conf/extra/httpd-manual.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-manual.conf)
-       $(call MKCNF,docs/conf/extra/httpd-mpm.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-mpm.conf)
-       $(call MKCNF,docs/conf/extra/httpd-multilang-errordoc.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-multilang-errordoc.conf)
-       $(call MKCNF,docs/conf/extra/httpd-userdir.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-userdir.conf)
-       $(call MKCNF,docs/conf/extra/httpd-vhosts.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-vhosts.conf)
-       $(call MKCNF,docs/conf/extra/httpd-ssl.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-ssl.conf)
-       $(call COPYR,docs/docroot,               $(INSTALL)/$(BASEDIR)/htdocs)
-       $(call COPYR,docs/error,                 $(INSTALL)/$(BASEDIR)/error)
-       $(call COPYR,docs/icons,                 $(INSTALL)/$(BASEDIR)/icons)
-       $(call COPYR,docs/man,                   $(INSTALL)/$(BASEDIR)/man)
-       $(call COPYR,docs/manual,                $(INSTALL)/$(BASEDIR)/manual)
+       $(call COPY,$(OBJDIR)/$(NLM_NAME).nlm,   $(INSTALLBASE)/)
+       $(call COPY,ABOUT_APACHE,                $(INSTALLBASE)/)
+       $(call COPY,CHANGES,                     $(INSTALLBASE)/)
+       $(call COPY,LICENSE,                     $(INSTALLBASE)/)
+       $(call COPY,README,                      $(INSTALLBASE)/)
+       $(call COPY,VERSIONING,                  $(INSTALLBASE)/)
+       $(call COPY,STATUS,                      $(INSTALLBASE)/)
+       $(call COPY,support/dbmmanage.in,        $(INSTALLBASE)/bin/dbmmanage.pl)
+       $(call COPY,support/logresolve.pl.in,    $(INSTALLBASE)/bin/logresolve.pl)
+       $(call COPY,support/split-logfile.in,    $(INSTALLBASE)/bin/split-logfile.pl)
+       $(call COPY,support/check_forensic,      $(INSTALLBASE)/bin/check_forensic.sh)
+       $(call COPY,docs/conf/magic,             $(INSTALLBASE)/conf/)
+       $(call COPY,docs/conf/mime.types,        $(INSTALLBASE)/conf/)
+       $(call COPY,docs/conf/charset.conv,      $(INSTALLBASE)/conf/)
+       $(call COPY,docs/cgi-examples/printenv,  $(INSTALLBASE)/cgi-bin/printenv.pl)
+       $(call MKCNF,docs/conf/httpd.conf.in,    $(INSTALLBASE)/conf/httpd.conf)
+       $(call MKCNF,docs/conf/extra/httpd-autoindex.conf.in, $(INSTALLBASE)/conf/extra/httpd-autoindex.conf)
+       $(call MKCNF,docs/conf/extra/httpd-dav.conf.in, $(INSTALLBASE)/conf/extra/httpd-dav.conf)
+       $(call MKCNF,docs/conf/extra/httpd-default.conf.in, $(INSTALLBASE)/conf/extra/httpd-default.conf)
+       $(call MKCNF,docs/conf/extra/httpd-info.conf.in, $(INSTALLBASE)/conf/extra/httpd-info.conf)
+       $(call MKCNF,docs/conf/extra/httpd-languages.conf.in, $(INSTALLBASE)/conf/extra/httpd-languages.conf)
+       $(call MKCNF,docs/conf/extra/httpd-manual.conf.in, $(INSTALLBASE)/conf/extra/httpd-manual.conf)
+       $(call MKCNF,docs/conf/extra/httpd-mpm.conf.in, $(INSTALLBASE)/conf/extra/httpd-mpm.conf)
+       $(call MKCNF,docs/conf/extra/httpd-multilang-errordoc.conf.in, $(INSTALLBASE)/conf/extra/httpd-multilang-errordoc.conf)
+       $(call MKCNF,docs/conf/extra/httpd-userdir.conf.in, $(INSTALLBASE)/conf/extra/httpd-userdir.conf)
+       $(call MKCNF,docs/conf/extra/httpd-vhosts.conf.in, $(INSTALLBASE)/conf/extra/httpd-vhosts.conf)
+       $(call MKCNF,docs/conf/extra/httpd-ssl.conf.in, $(INSTALLBASE)/conf/extra/httpd-ssl.conf)
+       $(call COPYR,docs/docroot,               $(INSTALLBASE)/htdocs)
+       $(call COPYR,docs/error,                 $(INSTALLBASE)/error)
+       $(call COPYR,docs/icons,                 $(INSTALLBASE)/icons)
+       $(call COPYR,docs/man,                   $(INSTALLBASE)/man)
+       $(call COPYR,docs/manual,                $(INSTALLBASE)/manual)
 
 installdev :: FORCE
-       $(call COPY,$(SRC)/include/*.h,          $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,$(NWOS)/*.h,                 $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,$(APR)/include/*.h,          $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,$(APRUTIL)/include/*.h,      $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,$(STDMOD)/core/mod_so.h,     $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,core/mod_watchdog.h,         $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,cache/mod_cache.h,           $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,database/mod_dbd.h,          $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,dav/main/mod_dav.h,          $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,filters/mod_include.h,       $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,generators/mod_cgi.h,        $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,generators/mod_status.h,     $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,loggers/mod_log_config.h,    $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,mappers/mod_rewrite.h,       $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,proxy/mod_proxy.h,           $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,proxy/mod_serf.h,            $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,session/mod_session.h,       $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,ssl/mod_ssl.h,               $(INSTALL)/$(BASEDIR)/include/)
-       $(call COPY,$(APR)/*.imp,                $(INSTALL)/$(BASEDIR)/lib/)
-       $(call COPY,$(NWOS)/*.imp,               $(INSTALL)/$(BASEDIR)/lib/)
-       $(call COPY,$(NWOS)/*.xdc,               $(INSTALL)/$(BASEDIR)/lib/)
+       $(call COPY,$(SRC)/include/*.h,          $(INSTALLBASE)/include/)
+       $(call COPY,$(NWOS)/*.h,                 $(INSTALLBASE)/include/)
+       $(call COPY,$(APR)/include/*.h,          $(INSTALLBASE)/include/)
+       $(call COPY,$(APRUTIL)/include/*.h,      $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/core/mod_so.h,     $(INSTALLBASE)/include/)
+       $(call COPY,core/mod_watchdog.h,         $(INSTALLBASE)/include/)
+       $(call COPY,cache/mod_cache.h,           $(INSTALLBASE)/include/)
+       $(call COPY,database/mod_dbd.h,          $(INSTALLBASE)/include/)
+       $(call COPY,dav/main/mod_dav.h,          $(INSTALLBASE)/include/)
+       $(call COPY,filters/mod_include.h,       $(INSTALLBASE)/include/)
+       $(call COPY,generators/mod_cgi.h,        $(INSTALLBASE)/include/)
+       $(call COPY,generators/mod_status.h,     $(INSTALLBASE)/include/)
+       $(call COPY,loggers/mod_log_config.h,    $(INSTALLBASE)/include/)
+       $(call COPY,mappers/mod_rewrite.h,       $(INSTALLBASE)/include/)
+       $(call COPY,proxy/mod_proxy.h,           $(INSTALLBASE)/include/)
+       $(call COPY,proxy/mod_serf.h,            $(INSTALLBASE)/include/)
+       $(call COPY,session/mod_session.h,       $(INSTALLBASE)/include/)
+       $(call COPY,ssl/mod_ssl.h,               $(INSTALLBASE)/include/)
+       $(call COPY,$(APR)/*.imp,                $(INSTALLBASE)/lib/)
+       $(call COPY,$(NWOS)/*.imp,               $(INSTALLBASE)/lib/)
+       $(call COPY,$(NWOS)/*.xdc,               $(INSTALLBASE)/lib/)
 
 prebuild :: FORCE
        $(MAKE) -C $(SERVER) -f NWGNUmakefile

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 87a7659f72965e709e627cce75da23b55b1e8a93..0f6ed523621bbcd69ee60f8afa2711b9cf9492c6 100644 (file)
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -320,24 +320,26 @@ endif
 
 endif
 
+INSTALLBASE := $(INSTALL)/$(BASEDIR)
+
 INSTDEVDIRS := \
        $(INSTDIRS) \
-       $(INSTALL)/$(BASEDIR)/include \
-       $(INSTALL)/$(BASEDIR)/lib \
+       $(INSTALLBASE)/include \
+       $(INSTALLBASE)/lib \
 
 INSTDIRS += \
        $(INSTALL)/$(BASEDIR) \
-       $(INSTALL)/$(BASEDIR)/bin \
-       $(INSTALL)/$(BASEDIR)/cgi-bin \
-       $(INSTALL)/$(BASEDIR)/conf \
-       $(INSTALL)/$(BASEDIR)/conf/extra \
-       $(INSTALL)/$(BASEDIR)/error \
-       $(INSTALL)/$(BASEDIR)/htdocs \
-       $(INSTALL)/$(BASEDIR)/icons \
-       $(INSTALL)/$(BASEDIR)/logs \
-       $(INSTALL)/$(BASEDIR)/man \
-       $(INSTALL)/$(BASEDIR)/manual \
-       $(INSTALL)/$(BASEDIR)/modules \
+       $(INSTALLBASE)/bin \
+       $(INSTALLBASE)/cgi-bin \
+       $(INSTALLBASE)/conf \
+       $(INSTALLBASE)/conf/extra \
+       $(INSTALLBASE)/error \
+       $(INSTALLBASE)/htdocs \
+       $(INSTALLBASE)/icons \
+       $(INSTALLBASE)/logs \
+       $(INSTALLBASE)/man \
+       $(INSTALLBASE)/manual \
+       $(INSTALLBASE)/modules \
 
 #
 # Common directories

diff --git a/build/NWGNUscripts.inc b/build/NWGNUscripts.inc
index ecaa7f6ae516750c2b4dfce3fa66f6129fc96b1a..7b0aa0d7093ec4ecb74387cc968633446e413467 100644 (file)
--- a/build/NWGNUscripts.inc
+++ b/build/NWGNUscripts.inc
@@ -1,8 +1,8 @@
 # Include for creating start/stop/restart NCF scripts.\r
 \r
-instscripts:: FORCE $(INSTALL)/$(BASEDIR)/ap2start.ncf $(INSTALL)/$(BASEDIR)/ap2auto.ncf $(INSTALL)/$(BASEDIR)/ap2rest.ncf $(INSTALL)/$(BASEDIR)/ap2stop.ncf\r
+instscripts:: FORCE $(INSTALLBASE)/ap2start.ncf $(INSTALLBASE)/ap2auto.ncf $(INSTALLBASE)/ap2rest.ncf $(INSTALLBASE)/ap2stop.ncf\r
 \r
-$(INSTALL)/$(BASEDIR)/ap2start.ncf:\r
+$(INSTALLBASE)/ap2start.ncf:\r
        @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@\r
        @echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@\r
        @echo $(DL)# httpcloseport 80 /silent$(DL)>> $@\r
@@ -12,7 +12,7 @@ $(INSTALL)/$(BASEDIR)/ap2start.ncf:
        @echo $(DL)# load SYS:/$(BASEDIR)/apache2$(DL)>> $@\r
        @$(ECHONL)>> $@\r
 \r
-$(INSTALL)/$(BASEDIR)/ap2auto.ncf:\r
+$(INSTALLBASE)/ap2auto.ncf:\r
        @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@\r
        @echo $(DL)# and let automatically restart in case it crashes$(DL)>> $@\r
        @echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@\r
@@ -21,21 +21,21 @@ $(INSTALL)/$(BASEDIR)/ap2auto.ncf:
        @echo $(DL)restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@\r
        @$(ECHONL)>> $@\r
 \r
-$(INSTALL)/$(BASEDIR)/ap2rest.ncf:\r
+$(INSTALLBASE)/ap2rest.ncf:\r
        @echo $(DL)# NCF to restart Apache 2.x in own address space$(DL)> $@\r
        @echo $(DL)apache2 restart -p $(BASEDIR)$(DL)>> $@\r
        @echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@\r
        @echo $(DL)# apache2 restart$(DL)>> $@\r
        @$(ECHONL)>> $@\r
 \r
-$(INSTALL)/$(BASEDIR)/ap2stop.ncf:\r
+$(INSTALLBASE)/ap2stop.ncf:\r
        @echo $(DL)# NCF to stop Apache 2.x in own address space$(DL)> $@\r
        @echo $(DL)apache2 shutdown -p $(BASEDIR)$(DL)>> $@\r
        @echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@\r
        @echo $(DL)# apache2 shutdown$(DL)>> $@\r
        @$(ECHONL)>> $@\r
 \r
-$(INSTALL)/$(BASEDIR)/ap2prod.ncf:\r
+$(INSTALLBASE)/ap2prod.ncf:\r
        @echo $(DL)# NCF to create a product record for Apache 2.x in product database$(DL)> $@\r
        @echo $(DL)PRODSYNC DEL APACHE$(VERSION_MAJMIN)$(DL)>> $@\r
        @echo $(DL)PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver"$(DL)>> $@\r

diff --git a/modules/aaa/NWGNUmakefile b/modules/aaa/NWGNUmakefile
index 5b9c6be87f4297bd9cbfbac101908f5679731f88..7320af5b50a503582c9f0db5e301df516bce7c53 100644 (file)
--- a/modules/aaa/NWGNUmakefile
+++ b/modules/aaa/NWGNUmakefile
@@ -248,7 +248,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/cache/NWGNUmakefile b/modules/cache/NWGNUmakefile
index cb2564e87aa571fda1bc5d09f753866c630c675c..bc0c58fe9fa818f535df4ffdad017f34c0c70a2f 100644 (file)
--- a/modules/cache/NWGNUmakefile
+++ b/modules/cache/NWGNUmakefile
@@ -233,7 +233,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/cluster/NWGNUmakefile b/modules/cluster/NWGNUmakefile
index 7a396f37e913db4b19cac330cfc1d9ddcd1f2a12..eda07b133f2c3592ff1657faed0851f42d4e44f6 100644 (file)
--- a/modules/cluster/NWGNUmakefile
+++ b/modules/cluster/NWGNUmakefile
@@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/database/NWGNUmakefile b/modules/database/NWGNUmakefile
index e4010a5787a2b0019d66c338dff3ec568a165fc0..7a96c04e83c2680ca60104973697e3b0579f4128 100644 (file)
--- a/modules/database/NWGNUmakefile
+++ b/modules/database/NWGNUmakefile
@@ -246,7 +246,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile
index 15c07df2aa6ad1836423f5324f1244ace26b4a59..6bbbad992717875051071451de9c412b2dc9280e 100644 (file)
--- a/modules/dav/fs/NWGNUmakefile
+++ b/modules/dav/fs/NWGNUmakefile
@@ -252,7 +252,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile
index 4f7c794e9689b98cc0c95fb95205e067a8b26db0..0346e060fcf7eba02c909c9a7e13d0338f5de864 100644 (file)
--- a/modules/dav/lock/NWGNUmakefile
+++ b/modules/dav/lock/NWGNUmakefile
@@ -243,7 +243,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile
index 1c14d6d480981eed335a40e8d2c87698ae363f4d..01e84386150bb3ac41f55648ee1f2e987263ffbd 100644 (file)
--- a/modules/dav/main/NWGNUmakefile
+++ b/modules/dav/main/NWGNUmakefile
@@ -252,7 +252,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/debugging/NWGNUmakefile b/modules/debugging/NWGNUmakefile
index 6050833b7d9873b3191cdf31e4c636ff8880d596..e2bfce3539043665e934248a76b3c05b289925c5 100644 (file)
--- a/modules/debugging/NWGNUmakefile
+++ b/modules/debugging/NWGNUmakefile
@@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/echo/NWGNUmakefile b/modules/echo/NWGNUmakefile
index d480347f4a63f9a7bce3fb602584c81ec728e354..7add53d6371d7aca1b1b28215d0f89b9e010413f 100644 (file)
--- a/modules/echo/NWGNUmakefile
+++ b/modules/echo/NWGNUmakefile
@@ -241,7 +241,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/examples/NWGNUmakefile b/modules/examples/NWGNUmakefile
index 382ec2f9876bb445e22caeece11af8c83c470eee..019257627069e780a7b0058559ab9d4761b58231 100644 (file)
--- a/modules/examples/NWGNUmakefile
+++ b/modules/examples/NWGNUmakefile
@@ -240,7 +240,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/experimental/NWGNUmakefile b/modules/experimental/NWGNUmakefile
index 1de8cbfa56e089586499cd6db271ce6d1496e408..29ec122b682f4afbb63597bc18aff4a93caee743 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
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/filters/NWGNUdeflate b/modules/filters/NWGNUdeflate
index e463ab39f41aa54be2f018da5f7867d19844ca29..579d1386b800e09cefe6e67c13c6dfaf32236d24 100644 (file)
--- a/modules/filters/NWGNUdeflate
+++ b/modules/filters/NWGNUdeflate
@@ -260,7 +260,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/filters/NWGNUmakefile b/modules/filters/NWGNUmakefile
index a42d32d820978b8b0a518a4862acf0f40314a84e..c8b06679fc81324ad672427934f29076d4c7f916 100644 (file)
--- a/modules/filters/NWGNUmakefile
+++ b/modules/filters/NWGNUmakefile
@@ -246,7 +246,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/generators/NWGNUmakefile b/modules/generators/NWGNUmakefile
index c282d657021fe065e4657f69171b265ae95aa93c..df9cfeca7c1d0a5c41dce378d0ce9ccd7ce18fa9 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
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/ldap/NWGNUmakefile b/modules/ldap/NWGNUmakefile
index 9d21f9941b5e1473d1603a5acfc8bcdc83c1808e..ef830253f3f95eae8798daded2a3401adead8f8f 100644 (file)
--- a/modules/ldap/NWGNUmakefile
+++ b/modules/ldap/NWGNUmakefile
@@ -248,7 +248,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/loggers/NWGNUforensic b/modules/loggers/NWGNUforensic
index 56587d73792ccfbfafb481b2f9867c266437dda9..c55f036cee55353e4f4a239ab1c2f630bb7b0fd7 100644 (file)
--- a/modules/loggers/NWGNUforensic
+++ b/modules/loggers/NWGNUforensic
@@ -242,7 +242,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/loggers/NWGNUmakefile b/modules/loggers/NWGNUmakefile
index 1d2e97a177152fd5e38cfc77e1f790bbb08035d7..d7429a0be70726c124978cb16aa3ab87cde9c352 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
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/loggers/NWGNUmodlogio b/modules/loggers/NWGNUmodlogio
index 186e67277833bd526e8b2e33475baebe4e937a14..fa376db73adc4594171a555c2c4e370bf22f8247 100644 (file)
--- a/modules/loggers/NWGNUmodlogio
+++ b/modules/loggers/NWGNUmodlogio
@@ -242,7 +242,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/lua/NWGNUmakefile b/modules/lua/NWGNUmakefile
index c7a4f6e089c56b5618ce096d3fd6132b2a86c684..6a5202eb81e159cf08386b701cd24832be9c92c3 100644 (file)
--- a/modules/lua/NWGNUmakefile
+++ b/modules/lua/NWGNUmakefile
@@ -254,7 +254,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/mappers/NWGNUmakefile b/modules/mappers/NWGNUmakefile
index e4d47a71afc40aabc83551302969ebc9a01ed4a4..d7abda553989e71444110681e90ffa6e3d3a63ba 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
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/metadata/NWGNUmakefile b/modules/metadata/NWGNUmakefile
index 158cb29fb215f568492e63b4ba422016815d76d8..fd93e0eb088e86dfcb5c95e5b4dd22346b86944c 100644 (file)
--- a/modules/metadata/NWGNUmakefile
+++ b/modules/metadata/NWGNUmakefile
@@ -238,7 +238,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/proxy/NWGNUmakefile b/modules/proxy/NWGNUmakefile
index 191511f2b279a03d8158bbc72d8a1775a4ffdf29..6d9e32aa2473b7844da12646ca576ec7c8838d81 100644 (file)
--- a/modules/proxy/NWGNUmakefile
+++ b/modules/proxy/NWGNUmakefile
@@ -247,7 +247,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/session/NWGNUmakefile b/modules/session/NWGNUmakefile
index e5a83e27887e26ed7af0b2bcf892be25cac89059..ff84dd889c24d2df4dcbfef0ee51a81eefa102ea 100644 (file)
--- a/modules/session/NWGNUmakefile
+++ b/modules/session/NWGNUmakefile
@@ -233,7 +233,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/slotmem/NWGNUmakefile b/modules/slotmem/NWGNUmakefile
index 9745c050b679da028cf4b42cac949b3b0a987c41..bdde37d7db29736e8af6bbdf0d8dacdec2c73230 100644 (file)
--- a/modules/slotmem/NWGNUmakefile
+++ b/modules/slotmem/NWGNUmakefile
@@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/ssl/NWGNUmakefile b/modules/ssl/NWGNUmakefile
index 37e0236154a0ccdadff77e70bd5e43b57e011b99..01c763815f809d1ac376728c91d28c2ca8d95543 100644 (file)
--- a/modules/ssl/NWGNUmakefile
+++ b/modules/ssl/NWGNUmakefile
@@ -309,9 +309,9 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm,        $(INSTALL)/$(BASEDIR)/modules/)
-       $(call COPY,$(SSL_BIN)/openssl.nlm, $(INSTALL)/$(BASEDIR)/bin/)
-       $(call COPY,$(SSL_APP)/openssl.cnf, $(INSTALL)/$(BASEDIR)/bin/)
+       $(call COPY,$(OBJDIR)/*.nlm,        $(INSTALLBASE)/modules/)
+       $(call COPY,$(SSL_BIN)/openssl.nlm, $(INSTALLBASE)/bin/)
+       $(call COPY,$(SSL_APP)/openssl.cnf, $(INSTALLBASE)/bin/)
 
 #
 # Any specialized rules here

diff --git a/modules/test/NWGNUmakefile b/modules/test/NWGNUmakefile
index 8521b77e4b9413903fe0ad16362e005fad34560b..1afb7af971897b90f3f560bc75fb7997f80fef61 100644 (file)
--- a/modules/test/NWGNUmakefile
+++ b/modules/test/NWGNUmakefile
@@ -240,7 +240,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
 
 #
 # Any specialized rules here

diff --git a/support/NWGNUmakefile b/support/NWGNUmakefile
index dce466fd0a3faad653f97c53fe4f5e9963071530..9cb5d1df42f75bd8ddeb91077bb8ecb75addefb9 100644 (file)
--- a/support/NWGNUmakefile
+++ b/support/NWGNUmakefile
@@ -35,7 +35,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/bin/)
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/bin/)
 
 #
 # Any specialized rules here