changed to use xcopy directly instead of creating a copy batch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@521344 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 289108c105a23036253865cc36e1929788fa7700..0cf5e5cb102da0af6e09ffcd27048ca6b7ee1078 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -7,7 +7,7 @@ SUBDIRS = \
        build \
        support \
        modules \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -78,7 +78,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -92,7 +92,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -114,10 +114,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = Apache2
+NLM_NAME       = Apache2
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 ifdef USE_STDSOCKETS
@@ -141,16 +141,16 @@ NLM_SCREEN_NAME = Apache $(VERSION_STR) for NetWare
 
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
 #
 NLM_STACK_SIZE = 65536
- 
+
 
 #
 # If this is specified it will be used by the link '-entry' directive
@@ -170,14 +170,14 @@ NLM_CHECK_SYM     = _LibCCheckUnload
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              =  PSEUDOPREEMPTION
+NLM_FLAGS      = PSEUDOPREEMPTION
 
 #
-# If this is specified it will be linked in with the XDCData option in the def 
+# If this is specified it will be linked in with the XDCData option in the def
 # file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled
 # by setting APACHE_UNIPROC in the environment
 #
-XDCDATA         = 
+XDCDATA                =
 
 #
 # If there is an NLM target, put it here
@@ -256,7 +256,7 @@ FILES_nlm_objs = \
 # Build in mod_nw_ssl if Winsock is being used
 ifndef USE_STDSOCKETS
 FILES_nlm_objs += $(OBJDIR)/mod_nw_ssl.o \
-              $(EOLIST)
+       $(EOLIST)
 endif
 
 #
@@ -264,7 +264,7 @@ endif
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -280,7 +280,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -304,22 +304,22 @@ FILES_nlm_Ximports = \
 # Don't link with Winsock if standard sockets are being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports += @ws2nlm.imp \
-              $(EOLIST)
+       $(EOLIST)
 endif
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        @$(NWOS)/httpd.imp \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -330,7 +330,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -342,11 +342,11 @@ install :: nlms FORCE
        -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   
+ifdef USE_STDSOCKETS
        -awk -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf
 else
        -awk -v BDIR=$(BASEDIR) -v SSL=1 -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf
-endif  
+endif
        $(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
@@ -363,17 +363,12 @@ endif
        -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)\$(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
+       @xcopy $(XCOPYSW) docs\error $(INSTALL)\$(BASEDIR)\error
+       @xcopy $(XCOPYSW) docs\docroot $(INSTALL)\$(BASEDIR)\htdocs
+       @xcopy $(XCOPYSW) docs\icons $(INSTALL)\$(BASEDIR)\icons
+       @xcopy $(XCOPYSW) docs\man $(INSTALL)\$(BASEDIR)\man
+       @xcopy $(XCOPYSW) docs\manual $(INSTALL)\$(BASEDIR)\manual
 
-
-    
 installdev :: FORCE
        -copy $(subst /,\,$(AP_WORK))\include\*.h           $(INSTALL)\$(BASEDIR)\include\*.*
        -copy $(subst /,\,$(AP_WORK))\os\netware\*.h        $(INSTALL)\$(BASEDIR)\include\*.*
@@ -382,7 +377,7 @@ installdev :: FORCE
        -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
        $(MAKE) -C srclib/pcre -f NWGNUMakefile
@@ -390,7 +385,6 @@ prebuild :: FORCE
        -copy $(AP_WORK)\server\$(OBJDIR)\*.nlm $(PREBUILD_INST)\*.*
        -copy $(AP_WORK)\srclib\pcre\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.*
 
-
 #
 # Any specialized rules here
 #
@@ -406,3 +400,4 @@ vpath %.c os/netware:server/mpm/netware:srclib/pcre
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+