Return-Path: Delivered-To: apmail-apr-cvs-archive@www.apache.org Received: (qmail 17958 invoked from network); 29 Apr 2004 16:51:41 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 29 Apr 2004 16:51:41 -0000 Received: (qmail 30800 invoked by uid 500); 29 Apr 2004 16:51:01 -0000 Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 30692 invoked by uid 500); 29 Apr 2004 16:50:59 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 30654 invoked from network); 29 Apr 2004 16:50:59 -0000 Date: 29 Apr 2004 16:51:06 -0000 Message-ID: <20040429165106.17304.qmail@minotaur.apache.org> From: bnicholes@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/build NWGNUenvironment.inc X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N bnicholes 2004/04/29 09:51:06 Modified: . Tag: APACHE_2_0_BRANCH NWGNUmakefile build Tag: APACHE_2_0_BRANCH NWGNUenvironment.inc . Tag: APR_0_9_BRANCH NWGNUmakefile build Tag: APR_0_9_BRANCH NWGNUenvironment.inc Log: Remove the hardcoded /Y parameter when doing a xcopy Submitted by: Guenter Knauf Revision Changes Path No revision No revision 1.13.2.13 +5 -5 httpd-2.0/NWGNUmakefile Index: NWGNUmakefile =================================================================== RCS file: /home/cvs/httpd-2.0/NWGNUmakefile,v retrieving revision 1.13.2.12 retrieving revision 1.13.2.13 diff -u -r1.13.2.12 -r1.13.2.13 --- NWGNUmakefile 14 Apr 2004 16:24:36 -0000 1.13.2.12 +++ NWGNUmakefile 29 Apr 2004 16:51:05 -0000 1.13.2.13 @@ -328,11 +328,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 No revision No revision 1.9.2.4 +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.9.2.3 retrieving revision 1.9.2.4 diff -u -r1.9.2.3 -r1.9.2.4 --- NWGNUenvironment.inc 9 Jan 2003 16:55:10 -0000 1.9.2.3 +++ NWGNUenvironment.inc 29 Apr 2004 16:51:05 -0000 1.9.2.4 @@ -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 No revision No revision 1.16.2.5 +1 -1 apr/NWGNUmakefile Index: NWGNUmakefile =================================================================== RCS file: /home/cvs/apr/NWGNUmakefile,v retrieving revision 1.16.2.4 retrieving revision 1.16.2.5 diff -u -r1.16.2.4 -r1.16.2.5 --- NWGNUmakefile 12 Apr 2004 20:50:54 -0000 1.16.2.4 +++ NWGNUmakefile 29 Apr 2004 16:51:05 -0000 1.16.2.5 @@ -320,7 +320,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 No revision No revision 1.9.2.2 +2 -0 apr/build/NWGNUenvironment.inc Index: NWGNUenvironment.inc =================================================================== RCS file: /home/cvs/apr/build/NWGNUenvironment.inc,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -u -r1.9.2.1 -r1.9.2.2 --- NWGNUenvironment.inc 21 Nov 2003 23:45:04 -0000 1.9.2.1 +++ NWGNUenvironment.inc 29 Apr 2004 16:51:06 -0000 1.9.2.2 @@ -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