www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-05 16:55:50 +03:00
Code Activity

Implement a BASEDIR build environment variable to allow the NetWare build to relocate the install files

Browse Source 
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
This commit is contained in:
Bradley Nicholes
2007-01-31 23:55:44 +00:00
parent 6e9dfd0b38
commit ba4156cadd
24 changed files with 77 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
NWGNUmakefile
View File

@@ -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

30
build/NWGNUenvironment.inc
View File

@@ -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

2
build/mkconfNW.awk
View File

@@ -15,7 +15,7 @@
BEGIN {
A["ServerRoot"] = "SYS:/APACHE2"
A["ServerRoot"] = "SYS:/"BDIR
A["Port"] = "80"
A["cgidir"] = "cgi-bin"
A["logfiledir"] = "logs"

2
modules/aaa/NWGNUmakefile
View File

@@ -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

2
modules/cache/NWGNUmakefile vendored
View File

@@ -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

2
modules/database/NWGNUmakefile
View File

@@ -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

2
modules/dav/fs/NWGNUmakefile
View File

@@ -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
#

2
modules/dav/lock/NWGNUmakefile
View File

@@ -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
#

2
modules/dav/main/NWGNUmakefile
View File

@@ -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

2
modules/debugging/NWGNUmakefile
View File

@@ -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

2
modules/echo/NWGNUmakefile
View File

@@ -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

2
modules/experimental/NWGNUmakefile
View File

@@ -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

2
modules/filters/NWGNUdeflate
View File

@@ -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

2
modules/filters/NWGNUmakefile
View File

@@ -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

2
modules/generators/NWGNUmakefile
View File

@@ -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

2
modules/ldap/NWGNUmakefile
View File

@@ -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

2
modules/loggers/NWGNUforensic
View File

@@ -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

2
modules/loggers/NWGNUmakefile
View File

@@ -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

2
modules/loggers/NWGNUmodlogio
View File

@@ -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

2
modules/mappers/NWGNUmakefile
View File

@@ -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

2
modules/metadata/NWGNUmakefile
View File

@@ -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

2
modules/proxy/NWGNUmakefile
View File

@@ -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

2
modules/ssl/NWGNUmakefile
View File

@@ -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

2
support/NWGNUmakefile
View File

@@ -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