summaryrefslogtreecommitdiff
path: root/NWGNUmakefile
diff options
context:
space:
mode:
authorBradley Nicholes <bnicholes@apache.org>2007-02-09 23:59:15 +0000
committerBradley Nicholes <bnicholes@apache.org>2007-02-09 23:59:15 +0000
commit786636766c8a37d1c7d8cf6bb085907a53d194ee (patch)
treee34db9c795db27667b61d2ca93632777ff85feae /NWGNUmakefile
parent05486e5e5d3aee30013e1c24149aef8bdd044957 (diff)
downloadhttpd-786636766c8a37d1c7d8cf6bb085907a53d194ee.tar.gz
Implement a BASEDIR build environment variable to allow the NetWare build to relocate the install files
Submitted by: Guenter Knauf <fuankg apache org> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@505572 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'NWGNUmakefile')
-rw-r--r--NWGNUmakefile76
1 files changed, 38 insertions, 38 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile
index c84e20f4ae..d491667041 100644
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -327,54 +327,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