Remove the hardcoded /Y parameter when doing a xcopy

Submitted by: Guenter Knauf <fuankg@apache.org>

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

diff --git a/NWGNUmakefile b/NWGNUmakefile
index f5a9ee4cd3a7bdf764668da725e3f8169c0d5b2b..f6174b0802bd63a8d48a2a713657d79ad928654f 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -326,11 +326,11 @@ install :: nlms FORCE
        -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\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
+       @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
        $(CMD) xc.bat
        $(DEL) xc.bat
 

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index b4d5df656b7c0a4a30726a0a8c592e94b5b940c6..206e0b40026905e1fd3501130f04e228f0b767d2 100644 (file)
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -246,12 +246,14 @@ CHKNOT=cmd /C if not exist
 DEL = del /F
 DELTREE = cmd /C rd /s/q
 WINNT=1
+XCOPYSW = /E
 else
 CMD=command /C
 CHK=command /C if exist
 CHKNOT=command /C if not exist
 DEL = del
 DELTREE = deltree /y
+XCOPYSW = /E /Y
 endif