@@ -45,7 +45,7 @@ SUBDIRS = \
4545# paths to tools
4646#
4747
48- include $(AP_WORK)\ build\ NWGNUhead.inc
48+ include $(AP_WORK)/ build/ NWGNUhead.inc
4949
5050#
5151# build this level's files
@@ -170,7 +170,7 @@ NLM_SCREEN_NAME = Apache $(VERSION_STR) for NetWare
170170
171171#
172172# If this is specified, it will override VERSION value in
173- # $(AP_WORK)\ build\ NWGNUenvironment.inc
173+ # $(AP_WORK)/ build/ NWGNUenvironment.inc
174174#
175175NLM_VERSION =
176176
@@ -183,12 +183,12 @@ NLM_STACK_SIZE = 65536
183183#
184184# If this is specified it will be used by the link '-entry' directive
185185#
186- NLM_ENTRY_SYM = _LibCPrelude
186+ NLM_ENTRY_SYM =
187187
188188#
189189# If this is specified it will be used by the link '-exit' directive
190190#
191- NLM_EXIT_SYM = _LibCPostlude
191+ NLM_EXIT_SYM =
192192
193193#
194194# If this is specified it will be used by the link '-check' directive
@@ -387,58 +387,58 @@ nlms :: libs $(TARGET_nlm)
387387
388388#
389389# Updated this target to create necessary directories and copy files to the
390- # correct place. (See $(AP_WORK)\ build\ NWGNUhead.inc for examples)
390+ # correct place. (See $(AP_WORK)/ build/ NWGNUhead.inc for examples)
391391#
392392install :: nlms instscripts FORCE
393- -copy $(OBJDIR)\ $(NLM_NAME).nlm $(INSTALL)\ $(BASEDIR)\*.*
394- -copy ABOUT_APACHE $(INSTALL)\ $(BASEDIR)\*.*
395- -copy CHANGES $(INSTALL)\ $(BASEDIR)\*.*
396- -copy LICENSE $(INSTALL)\ $(BASEDIR)\*.*
397- -copy README $(INSTALL)\ $(BASEDIR)\*.*
398- -copy VERSIONING $(INSTALL)\ $(BASEDIR)\*.*
399- -copy STATUS $(INSTALL)\ $(BASEDIR)\*.*
400- -copy support\ dbmmanage.in $(INSTALL)\ $(BASEDIR)\ bin\ dbmmanage.pl
401- -copy support\ logresolve.pl.in $(INSTALL)\ $(BASEDIR)\ bin\ logresolve.pl
402- -copy support\ split-logfile.in $(INSTALL)\ $(BASEDIR)\ bin\ split-logfile.pl
403- -copy support\ check_forensic $(INSTALL)\ $(BASEDIR)\ bin\ check_forensic.sh
404- -copy docs\ conf\ magic $(INSTALL)\ $(BASEDIR)\ conf\magic
405- -copy docs\ conf\ mime.types $(INSTALL)\ $(BASEDIR)\ conf\mime.types
406- -copy docs\ conf\ charset.conv $(INSTALL)\ $(BASEDIR)\ conf\charset.conv
407- -copy docs\ cgi-examples\ printenv $(INSTALL)\ $(BASEDIR)\ cgi-bin\ printenv.pl
408- -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build\mkconfnw.awk docs\ conf\ httpd.conf.in >$(INSTALL)\ $(BASEDIR)\ conf\httpd.conf
409- $(CHKNOT) $(INSTALL)\ $(BASEDIR)\ conf\ extra\nul mkdir $(INSTALL)\$(BASEDIR)\conf\extra
410- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\ conf\ extra\ httpd-autoindex.conf.in >$(INSTALL)\ $(BASEDIR)\ conf\ extra\ httpd-autoindex.conf
411- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\ conf\ extra\ httpd-dav.conf.in >$(INSTALL)\ $(BASEDIR)\ conf\ extra\ httpd-dav.conf
412- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\ conf\ extra\ httpd-default.conf.in >$(INSTALL)\ $(BASEDIR)\ conf\ extra\ httpd-default.conf
413- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\ conf\ extra\ httpd-info.conf.in >$(INSTALL)\ $(BASEDIR)\ conf\ extra\ httpd-info.conf
414- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\ conf\ extra\ httpd-languages.conf.in >$(INSTALL)\ $(BASEDIR)\ conf\ extra\ httpd-languages.conf
415- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\ conf\ extra\ httpd-manual.conf.in >$(INSTALL)\ $(BASEDIR)\ conf\ extra\ httpd-manual.conf
416- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\ conf\ extra\ httpd-mpm.conf.in >$(INSTALL)\ $(BASEDIR)\ conf\ extra\ httpd-mpm.conf
417- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\ conf\ extra\ httpd-multilang-errordoc.conf.in >$(INSTALL)\ $(BASEDIR)\ conf\ extra\ httpd-multilang-errordoc.conf
418- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\ conf\ extra\ httpd-userdir.conf.in >$(INSTALL)\ $(BASEDIR)\ conf\ extra\ httpd-userdir.conf
419- -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -f build\mkconfnw.awk docs\ conf\ extra\ httpd-vhosts.conf.in >$(INSTALL)\ $(BASEDIR)\ conf\ extra\ httpd-vhosts.conf
420- -$(AWK) -v BDIR=$(BASEDIR) -v SSLPORT=$(SSLPORT) -f build\mkconfnw.awk docs\ conf\ extra\ httpd-ssl.conf.in >$(INSTALL)\ $(BASEDIR)\ conf\ extra\ httpd-ssl.conf
421- @xcopy $(XCOPYSW) docs\error $(INSTALL)\ $(BASEDIR)\error
422- @xcopy $(XCOPYSW) docs\docroot $(INSTALL)\ $(BASEDIR)\htdocs
423- @xcopy $(XCOPYSW) docs\ icons $(INSTALL)\ $(BASEDIR)\icons
424- @xcopy $(XCOPYSW) docs\ man $(INSTALL)\ $(BASEDIR)\man
425- @xcopy $(XCOPYSW) docs\ manual $(INSTALL)\ $(BASEDIR)\manual
393+ $(call COPY, $(OBJDIR)/ $(NLM_NAME).nlm, $(INSTALL)/ $(BASEDIR)/)
394+ $(call COPY, ABOUT_APACHE, $(INSTALL)/ $(BASEDIR)/)
395+ $(call COPY, CHANGES, $(INSTALL)/ $(BASEDIR)/)
396+ $(call COPY, LICENSE, $(INSTALL)/ $(BASEDIR)/)
397+ $(call COPY, README, $(INSTALL)/ $(BASEDIR)/)
398+ $(call COPY, VERSIONING, $(INSTALL)/ $(BASEDIR)/)
399+ $(call COPY, STATUS, $(INSTALL)/ $(BASEDIR)/)
400+ $(call COPY, support/ dbmmanage.in, $(INSTALL)/ $(BASEDIR)/ bin/ dbmmanage.pl)
401+ $(call COPY, support/ logresolve.pl.in, $(INSTALL)/ $(BASEDIR)/ bin/ logresolve.pl)
402+ $(call COPY, support/ split-logfile.in, $(INSTALL)/ $(BASEDIR)/ bin/ split-logfile.pl)
403+ $(call COPY, support/ check_forensic, $(INSTALL)/ $(BASEDIR)/ bin/ check_forensic.sh)
404+ $(call COPY, docs/ conf/ magic, $(INSTALL)/ $(BASEDIR)/ conf/)
405+ $(call COPY, docs/ conf/ mime.types, $(INSTALL)/ $(BASEDIR)/ conf/)
406+ $(call COPY, docs/ conf/ charset.conv, $(INSTALL)/ $(BASEDIR)/ conf/)
407+ $(call COPY, docs/ cgi-examples/ printenv, $(INSTALL)/ $(BASEDIR)/ cgi-bin/ printenv.pl)
408+ -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build\mkconfnw.awk docs/ conf/ httpd.conf.in >$(INSTALL)/ $(BASEDIR)/ conf\httpd.conf
409+ $(call MKDIR, $(INSTALL)/ $(BASEDIR)/ conf/ extra)
410+ -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/ conf/ extra/ httpd-autoindex.conf.in >$(INSTALL)/ $(BASEDIR)/ conf/ extra/ httpd-autoindex.conf
411+ -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/ conf/ extra/ httpd-dav.conf.in >$(INSTALL)/ $(BASEDIR)/ conf/ extra/ httpd-dav.conf
412+ -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/ conf/ extra/ httpd-default.conf.in >$(INSTALL)/ $(BASEDIR)/ conf/ extra/ httpd-default.conf
413+ -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/ conf/ extra/ httpd-info.conf.in >$(INSTALL)/ $(BASEDIR)/ conf/ extra/ httpd-info.conf
414+ -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/ conf/ extra/ httpd-languages.conf.in >$(INSTALL)/ $(BASEDIR)/ conf/ extra/ httpd-languages.conf
415+ -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/ conf/ extra/ httpd-manual.conf.in >$(INSTALL)/ $(BASEDIR)/ conf/ extra/ httpd-manual.conf
416+ -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/ conf/ extra/ httpd-mpm.conf.in >$(INSTALL)/ $(BASEDIR)/ conf/ extra/ httpd-mpm.conf
417+ -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/ conf/ extra/ httpd-multilang-errordoc.conf.in >$(INSTALL)/ $(BASEDIR)/ conf/ extra/ httpd-multilang-errordoc.conf
418+ -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/ conf/ extra/ httpd-userdir.conf.in >$(INSTALL)/ $(BASEDIR)/ conf/ extra/ httpd-userdir.conf
419+ -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -f build\mkconfnw.awk docs/ conf/ extra/ httpd-vhosts.conf.in >$(INSTALL)/ $(BASEDIR)/ conf/ extra/ httpd-vhosts.conf
420+ -$(AWK) -v BDIR=$(BASEDIR) -v SSLPORT=$(SSLPORT) -f build\mkconfnw.awk docs/ conf/ extra/ httpd-ssl.conf.in >$(INSTALL)/ $(BASEDIR)/ conf/ extra/ httpd-ssl.conf
421+ $(call COPYR, docs/docroot, $(INSTALL)/ $(BASEDIR)/htdocs)
422+ $(call COPYR, docs/error, $(INSTALL)/ $(BASEDIR)/)
423+ $(call COPYR, docs/ icons, $(INSTALL)/ $(BASEDIR)/)
424+ $(call COPYR, docs/ man, $(INSTALL)/ $(BASEDIR)/)
425+ $(call COPYR, docs/ manual, $(INSTALL)/ $(BASEDIR)/)
426426
427427installdev :: FORCE
428- -copy $(subst /,\,$(AP_WORK))\ include\ *.h $(INSTALL)\ $(BASEDIR)\ include\*.*
429- -copy $(subst /,\, $(NWOS))\ *.h $(INSTALL)\ $(BASEDIR)\ include\*.*
430- -copy $(subst /,\, $(APR))\ include\ *.h $(INSTALL)\ $(BASEDIR)\ include\*.*
431- -copy $(subst /,\, $(APRUTIL))\ include\ *.h $(INSTALL)\ $(BASEDIR)\ include\*.*
432- -copy $(subst /,\, $(APR))\ *.imp $(INSTALL)\ $(BASEDIR)\ lib\*.*
433- -copy $(subst /,\, $(NWOS))\ *.imp $(INSTALL)\ $(BASEDIR)\ lib\*.*
434- -copy $(subst /,\, $(NWOS))\ *.xdc $(INSTALL)\ $(BASEDIR)\ lib\*.*
428+ $(call COPY,$(SRC)/ include/ *.h, $(INSTALL)/ $(BASEDIR)/ include/)
429+ $(call COPY, $(NWOS)/ *.h, $(INSTALL)/ $(BASEDIR)/ include/)
430+ $(call COPY, $(APR)/ include/ *.h, $(INSTALL)/ $(BASEDIR)/ include/)
431+ $(call COPY, $(APRUTIL)/ include/ *.h, $(INSTALL)/ $(BASEDIR)/ include/)
432+ $(call COPY, $(APR)/ *.imp, $(INSTALL)/ $(BASEDIR)/ lib/)
433+ $(call COPY, $(NWOS)/ *.imp, $(INSTALL)/ $(BASEDIR)/ lib/)
434+ $(call COPY, $(NWOS)/ *.xdc, $(INSTALL)/ $(BASEDIR)/ lib/)
435435
436436prebuild :: FORCE
437437 $(MAKE) -C $(SERVER) -f NWGNUmakefile
438438 $(MAKE) -C $(PCRE) -f NWGNUmakefile
439- $(CHKNOT) $(subst /,\,$(PREBUILD_INST))\nul mkdir $(subst /,\ ,$(PREBUILD_INST))
440- -copy $(AP_WORK)\server\ $(OBJDIR)\ *.nlm $(PREBUILD_INST)\*.*
441- -copy $(PCRE)\$(basename $( OBJDIR))\ *.nlm $(PREBUILD_INST)\*.*
439+ $(call MKDIR ,$(PREBUILD_INST))
440+ $(call COPY,$(SERVER)/ $(OBJDIR)/ *.nlm, $(PREBUILD_INST)/)
441+ $(call COPY, $(PCRE)/$( OBJDIR)/ *.nlm, $(PREBUILD_INST)/)
442442
443443#
444444# Any specialized rules here
@@ -453,8 +453,8 @@ vpath %.c modules/core:os/netware:server/mpm/netware:$(PCRE)
453453# in this makefile
454454#
455455
456- include $(AP_WORK)\build\ NWGNUtail.inc
456+ include $(APBUILD)/ NWGNUtail.inc
457457
458- include $(AP_WORK)\build\ NWGNUscripts.inc
458+ include $(APBUILD)/ NWGNUscripts.inc
459459
460460
0 commit comments