update forgotten transformation

[apache] / NWGNUmakefile

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 8ed838ae0f7c0f52ff4472cfb0d1e2a52a2c4b8b..006e358ae6f463e5c0ca7788ec396fba837335a2 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -119,13 +119,21 @@ NLM_NAME          = Apache2
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION        = Apache Web Server 
+NLM_DESCRIPTION        = Apache Web Server $(VERSION_STR)
 
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
 NLM_THREAD_NAME        = Apache
+
+#
+# This is used by the '-screenname' directive.  If left blank,
+# 'Apache for NetWare' Thread will be used.
+#
+NLM_SCREEN_NAME = Apache $(VERSION_STR) for NetWare
+
+
 #
 # If this is specified, it will override VERSION value in 
 # $(AP_WORK)\build\NWGNUenvironment.inc
@@ -194,12 +202,12 @@ FILES_nlm_objs = \
        $(OBJDIR)/listen.o \
        $(OBJDIR)/log.o \
        $(OBJDIR)/main.o \
-       $(OBJDIR)/mod_access.o \
+       $(OBJDIR)/mod_authz_host.o \
        $(OBJDIR)/mod_actions.o \
        $(OBJDIR)/mod_alias.o \
        $(OBJDIR)/mod_asis.o \
-       $(OBJDIR)/mod_auth.o \
        $(OBJDIR)/mod_autoindex.o \
+       $(OBJDIR)/mod_cgi.o \
        $(OBJDIR)/mod_dir.o \
        $(OBJDIR)/mod_env.o \
        $(OBJDIR)/mod_imap.o \
@@ -207,6 +215,7 @@ FILES_nlm_objs = \
        $(OBJDIR)/mod_log_config.o \
        $(OBJDIR)/mod_mime.o \
        $(OBJDIR)/mod_negotiation.o \
+       $(OBJDIR)/mod_netware.o \
        $(OBJDIR)/mod_nw_ssl.o \
        $(OBJDIR)/mod_setenvif.o \
        $(OBJDIR)/mod_so.o \
@@ -217,12 +226,13 @@ FILES_nlm_objs = \
        $(OBJDIR)/pcre.o \
        $(OBJDIR)/pcreposix.o \
        $(OBJDIR)/protocol.o \
+       $(OBJDIR)/provider.o \
        $(OBJDIR)/request.o \
-       $(OBJDIR)/rfc1413.o \
        $(OBJDIR)/scoreboard.o \
        $(OBJDIR)/util.o \
        $(OBJDIR)/util_cfgtree.o \
        $(OBJDIR)/util_charset.o \
+       $(OBJDIR)/util_debug.o \
        $(OBJDIR)/util_filter.o \
        $(OBJDIR)/util_md5.o \
        $(OBJDIR)/util_nw.o \
@@ -302,21 +312,24 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       copy $(OBJDIR)\Apache2.nlm $(INSTALL)\Apache2\*.*
+       -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
        -awk  -f build\mkconfnw.awk docs\conf\httpd-std.conf.in >$(INSTALL)\Apache2\conf\httpd.conf
        -copy docs\conf\magic           $(INSTALL)\Apache2\conf\magic
        -copy docs\conf\mime.types      $(INSTALL)\Apache2\conf\mime.types
+       -copy docs\cgi-examples\printenv $(INSTALL)\Apache2\cgi-bin\printenv.pl
        @echo rem copying the docs directories > xc.bat
-       @echo xcopy docs\cgi-examples $(INSTALL)\Apache2\cgi-examples /E >> xc.bat
-       @echo xcopy docs\error $(INSTALL)\Apache2\error /E >> xc.bat
-       @echo xcopy docs\docroot $(INSTALL)\Apache2\htdocs /E >> xc.bat
-       @echo xcopy docs\icons $(INSTALL)\Apache2\icons /E >> xc.bat
-       @echo xcopy docs\man $(INSTALL)\Apache2\man /E >> xc.bat
-       @echo xcopy docs\manual $(INSTALL)\Apache2\manual /E >> xc.bat
+       @echo xcopy docs\error $(INSTALL)\Apache2\error /E /Y >> xc.bat
+       @echo xcopy docs\docroot $(INSTALL)\Apache2\htdocs /E /Y >> xc.bat
+       @echo xcopy docs\icons $(INSTALL)\Apache2\icons /E /Y >> xc.bat
+       @echo xcopy docs\man $(INSTALL)\Apache2\man /E /Y >> xc.bat
+       @echo xcopy docs\manual $(INSTALL)\Apache2\manual /E /Y >> xc.bat
        $(CMD) xc.bat
 
 
@@ -324,12 +337,11 @@ install :: nlms FORCE
 installdev :: FORCE
        -copy $(subst /,\,$(AP_WORK))\include\*.h           $(INSTALL)\Apache2\include\*.*
        -copy $(subst /,\,$(AP_WORK))\os\netware\*.h        $(INSTALL)\Apache2\include\*.*
-       -copy $(subst /,\,$(NWOS))\include\*.h              $(INSTALL)\Apache2\include\*.*
        -copy $(subst /,\,$(NWOS))\*.imp                    $(INSTALL)\Apache2\lib\*.*
        -copy $(subst /,\,$(APR))\include\*.h               $(INSTALL)\Apache2\include\*.*
-       -copy $(subst /,\,$(APR))\arch\netware\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\*.*
     
 #
 # Any specialized rules here