bnicholes 2004/04/29 09:49:50
Modified: . NWGNUmakefile
build NWGNUenvironment.inc
. NWGNUmakefile
build NWGNUenvironment.inc
Log:
Remove the hardcoded /Y parameter when doing a xcopy
Submitted by: Guenter Knauf <[EMAIL PROTECTED]>
Revision Changes Path
1.24 +5 -5 httpd-2.0/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file: /home/cvs/httpd-2.0/NWGNUmakefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- NWGNUmakefile 6 Apr 2004 22:47:46 -0000 1.23
+++ NWGNUmakefile 29 Apr 2004 16:49:50 -0000 1.24
@@ -326,11 +326,11 @@
-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
1.13 +2 -0 httpd-2.0/build/NWGNUenvironment.inc
Index: NWGNUenvironment.inc
===================================================================
RCS file: /home/cvs/httpd-2.0/build/NWGNUenvironment.inc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- NWGNUenvironment.inc 9 Jan 2003 16:55:46 -0000 1.12
+++ NWGNUenvironment.inc 29 Apr 2004 16:49:50 -0000 1.13
@@ -246,12 +246,14 @@
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
1.26 +1 -1 apr/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file: /home/cvs/apr/NWGNUmakefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- NWGNUmakefile 8 Apr 2004 22:39:29 -0000 1.25
+++ NWGNUmakefile 29 Apr 2004 16:49:50 -0000 1.26
@@ -324,7 +324,7 @@
-copy $(subst /,\,$(APRUTIL))\STATUS $(INSTALLBASE)\*.apu
-copy $(subst /,\,$(APRUTIL))\CHANGES $(INSTALLBASE)\*.apu
@echo rem copying the docs directories > xc.bat
- @echo xcopy docs $(INSTALLBASE)\docs\*.* /E /Y >> xc.bat
+ @echo xcopy docs $(INSTALLBASE)\docs\*.* $(XCOPYSW) >> xc.bat
$(CMD) xc.bat
$(DEL) xc.bat
endif
1.11 +2 -0 apr/build/NWGNUenvironment.inc
Index: NWGNUenvironment.inc
===================================================================
RCS file: /home/cvs/apr/build/NWGNUenvironment.inc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NWGNUenvironment.inc 21 Nov 2003 23:44:15 -0000 1.10
+++ NWGNUenvironment.inc 29 Apr 2004 16:49:50 -0000 1.11
@@ -243,12 +243,14 @@
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
