From: Bradley Nicholes <bnicholes@apache.org>
Date: Thu, 29 Apr 2004 16:49:50 +0000 (+0000)
Subject: Remove the hardcoded /Y parameter when doing a xcopy
X-Git-Tag: pre_ajp_proxy~302
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8dc8b7cacd8c7b76bb81e658ef3422f8b1c57946;p=apache

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 f5a9ee4cd3..f6174b0802 100644
--- 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 b4d5df656b..206e0b4002 100644
--- 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