From: Bradley Nicholes Date: Thu, 29 Apr 2004 16:51:05 +0000 (+0000) Subject: Remove the hardcoded /Y parameter when doing a xcopy X-Git-Tag: 2.0.50~144 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72396e6ce9e20f81a3d32ef72d983f8702222e4f;p=thirdparty%2Fapache%2Fhttpd.git Remove the hardcoded /Y parameter when doing a xcopy Submitted by: Guenter Knauf git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103551 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/NWGNUmakefile b/NWGNUmakefile index 4b4fafdf131..8e92f45b1af 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -328,11 +328,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 ae0cd0e19e1..d8374f1388c 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