You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2011/03/18 05:56:07 UTC
svn commit: r1082821 - in /httpd/httpd/trunk: ./ build/ modules/aaa/
modules/cache/ modules/cluster/ modules/database/ modules/dav/fs/
modules/dav/lock/ modules/dav/main/ modules/debugging/ modules/echo/
modules/examples/ modules/experimental/ modules/...
Author: fuankg
Date: Fri Mar 18 04:56:06 2011
New Revision: 1082821
URL: http://svn.apache.org/viewvc?rev=1082821&view=rev
Log:
Use a var INSTALLBASE to simplify NetWare installation rules.
Modified:
httpd/httpd/trunk/NWGNUmakefile
httpd/httpd/trunk/build/NWGNUenvironment.inc
httpd/httpd/trunk/build/NWGNUscripts.inc
httpd/httpd/trunk/modules/aaa/NWGNUmakefile
httpd/httpd/trunk/modules/cache/NWGNUmakefile
httpd/httpd/trunk/modules/cluster/NWGNUmakefile
httpd/httpd/trunk/modules/database/NWGNUmakefile
httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile
httpd/httpd/trunk/modules/dav/lock/NWGNUmakefile
httpd/httpd/trunk/modules/dav/main/NWGNUmakefile
httpd/httpd/trunk/modules/debugging/NWGNUmakefile
httpd/httpd/trunk/modules/echo/NWGNUmakefile
httpd/httpd/trunk/modules/examples/NWGNUmakefile
httpd/httpd/trunk/modules/experimental/NWGNUmakefile
httpd/httpd/trunk/modules/filters/NWGNUdeflate
httpd/httpd/trunk/modules/filters/NWGNUmakefile
httpd/httpd/trunk/modules/generators/NWGNUmakefile
httpd/httpd/trunk/modules/ldap/NWGNUmakefile
httpd/httpd/trunk/modules/loggers/NWGNUforensic
httpd/httpd/trunk/modules/loggers/NWGNUmakefile
httpd/httpd/trunk/modules/loggers/NWGNUmodlogio
httpd/httpd/trunk/modules/lua/NWGNUmakefile
httpd/httpd/trunk/modules/mappers/NWGNUmakefile
httpd/httpd/trunk/modules/metadata/NWGNUmakefile
httpd/httpd/trunk/modules/proxy/NWGNUmakefile
httpd/httpd/trunk/modules/session/NWGNUmakefile
httpd/httpd/trunk/modules/slotmem/NWGNUmakefile
httpd/httpd/trunk/modules/ssl/NWGNUmakefile
httpd/httpd/trunk/modules/test/NWGNUmakefile
httpd/httpd/trunk/support/NWGNUmakefile
Modified: httpd/httpd/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUenvironment.inc?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/trunk/build/NWGNUenvironment.inc Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/build/NWGNUscripts.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUscripts.inc?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUscripts.inc (original)
+++ httpd/httpd/trunk/build/NWGNUscripts.inc Fri Mar 18 04:56:06 2011
@@ -1,8 +1,8 @@
# Include for creating start/stop/restart NCF scripts.
-instscripts:: FORCE $(INSTALL)/$(BASEDIR)/ap2start.ncf $(INSTALL)/$(BASEDIR)/ap2auto.ncf $(INSTALL)/$(BASEDIR)/ap2rest.ncf $(INSTALL)/$(BASEDIR)/ap2stop.ncf
+instscripts:: FORCE $(INSTALLBASE)/ap2start.ncf $(INSTALLBASE)/ap2auto.ncf $(INSTALLBASE)/ap2rest.ncf $(INSTALLBASE)/ap2stop.ncf
-$(INSTALL)/$(BASEDIR)/ap2start.ncf:
+$(INSTALLBASE)/ap2start.ncf:
@echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@
@echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@
@echo $(DL)# httpcloseport 80 /silent$(DL)>> $@
@@ -12,7 +12,7 @@ $(INSTALL)/$(BASEDIR)/ap2start.ncf:
@echo $(DL)# load SYS:/$(BASEDIR)/apache2$(DL)>> $@
@$(ECHONL)>> $@
-$(INSTALL)/$(BASEDIR)/ap2auto.ncf:
+$(INSTALLBASE)/ap2auto.ncf:
@echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@
@echo $(DL)# and let automatically restart in case it crashes$(DL)>> $@
@echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@
@@ -21,21 +21,21 @@ $(INSTALL)/$(BASEDIR)/ap2auto.ncf:
@echo $(DL)restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@
@$(ECHONL)>> $@
-$(INSTALL)/$(BASEDIR)/ap2rest.ncf:
+$(INSTALLBASE)/ap2rest.ncf:
@echo $(DL)# NCF to restart Apache 2.x in own address space$(DL)> $@
@echo $(DL)apache2 restart -p $(BASEDIR)$(DL)>> $@
@echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@
@echo $(DL)# apache2 restart$(DL)>> $@
@$(ECHONL)>> $@
-$(INSTALL)/$(BASEDIR)/ap2stop.ncf:
+$(INSTALLBASE)/ap2stop.ncf:
@echo $(DL)# NCF to stop Apache 2.x in own address space$(DL)> $@
@echo $(DL)apache2 shutdown -p $(BASEDIR)$(DL)>> $@
@echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@
@echo $(DL)# apache2 shutdown$(DL)>> $@
@$(ECHONL)>> $@
-$(INSTALL)/$(BASEDIR)/ap2prod.ncf:
+$(INSTALLBASE)/ap2prod.ncf:
@echo $(DL)# NCF to create a product record for Apache 2.x in product database$(DL)> $@
@echo $(DL)PRODSYNC DEL APACHE$(VERSION_MAJMIN)$(DL)>> $@
@echo $(DL)PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver"$(DL)>> $@
Modified: httpd/httpd/trunk/modules/aaa/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/cache/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/cache/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/cluster/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/cluster/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/database/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/database/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/database/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/database/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/dav/lock/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/lock/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/lock/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/dav/lock/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/dav/main/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/dav/main/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/debugging/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/debugging/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/debugging/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/debugging/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/echo/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/echo/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/echo/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/echo/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/examples/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/examples/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/examples/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/examples/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/experimental/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/experimental/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/experimental/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/experimental/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/filters/NWGNUdeflate
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/NWGNUdeflate?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUdeflate (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUdeflate Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/filters/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/generators/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/generators/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/ldap/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/ldap/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/loggers/NWGNUforensic
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/loggers/NWGNUforensic?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/loggers/NWGNUforensic (original)
+++ httpd/httpd/trunk/modules/loggers/NWGNUforensic Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/loggers/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/loggers/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/loggers/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/loggers/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/loggers/NWGNUmodlogio
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/loggers/NWGNUmodlogio?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/loggers/NWGNUmodlogio (original)
+++ httpd/httpd/trunk/modules/loggers/NWGNUmodlogio Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/lua/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/lua/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/mappers/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/mappers/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/metadata/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/proxy/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/session/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/session/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/session/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/slotmem/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/slotmem/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/slotmem/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/ssl/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/ssl/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/modules/test/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/test/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/test/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/test/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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
Modified: httpd/httpd/trunk/support/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/NWGNUmakefile?rev=1082821&r1=1082820&r2=1082821&view=diff
==============================================================================
--- httpd/httpd/trunk/support/NWGNUmakefile (original)
+++ httpd/httpd/trunk/support/NWGNUmakefile Fri Mar 18 04:56:06 2011
@@ -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