# HG changeset patch
# User adrian
# Date 1031949311 0
# Node ID cba22ad5bbfde2df80975fe094c78658c651f3d8
# Parent  260c3ca9785e4c608e5096f8cb0c3366a8e606ec
[xemacs-hg @ 2002-09-13 20:35:10 by adrian]
xemacs-21.5: Install to overwrite existing files, support xemacs_extra_name




-------------------- ChangeLog entries follow: --------------------


nt/ChangeLog addition:

2002-09-13  Adrian Aichner  <adrian@xemacs.org>

	* xemacs.mak: Suppress confirmation for overwriting files.
	* xemacs.mak (installation): Add support for xemacs_extra_name.

diff -r 260c3ca9785e -r cba22ad5bbfd nt/ChangeLog
--- a/nt/ChangeLog	Thu Sep 12 21:54:19 2002 +0000
+++ b/nt/ChangeLog	Fri Sep 13 20:35:11 2002 +0000
@@ -1,3 +1,8 @@
+2002-09-13  Adrian Aichner  <adrian@xemacs.org>
+
+	* xemacs.mak: Suppress confirmation for overwriting files.
+	* xemacs.mak (installation): Add support for xemacs_extra_name.
+
 2002-08-30  Steve Youngs  <youngs@xemacs.org>
 
 	* XEmacs 21.5.9 "brussels sprouts" is released.
diff -r 260c3ca9785e -r cba22ad5bbfd nt/xemacs.mak
--- a/nt/xemacs.mak	Thu Sep 12 21:54:19 2002 +0000
+++ b/nt/xemacs.mak	Fri Sep 13 20:35:11 2002 +0000
@@ -56,11 +56,13 @@
 # So only delete one glob at a time.  Override flags in config.inc.
 DEL=del
 
-# Define the 'copy' command to use
-# Suppress confirmation for overwriting files
+# Tell COPY, MOVE, and XCOPY to suppress confirmation for overwriting
+# files.
+# set COPYCMD=/y
+# Define the 'copy' command to use.
 # Use /r (instead of /y), which exists on Windows NT 4 and 5.
-COPY=xcopy /q /y
-COPYDIR=xcopy /q /y /e
+COPY=xcopy /q /r
+COPYDIR=xcopy /q /r /e
 
 # Program name and version
 
@@ -570,9 +572,11 @@
 	@copy $(SRC)\config.h.in $(SRC)\config.h
 
 $(SRC)\Emacs.ad.h:	Emacs.ad.h
+	set COPYCMD=/y
 	@$(COPY) Emacs.ad.h $(SRC)
 
 $(SRC)\paths.h:	paths.h
+	set COPYCMD=/y
 	@$(COPY) paths.h $(SRC)
 
 #------------------------------------------------------------------------------
@@ -1334,6 +1338,7 @@
 # use this rule to install the system
 install:	all
 	cd $(NT)
+	set COPYCMD=/y
 	@echo Installing in $(INSTALL_DIR) ...
 	@echo PlaceHolder > PlaceHolder
 	@$(COPY) PROBLEMS "$(INSTALL_DIR)\"
@@ -1447,7 +1452,7 @@
 OS: $(OS)
 !endif
 
-XEmacs $(XEMACS_VERSION_STRING) $(xemacs_codename:"=\") configured for `$(EMACS_CONFIGURATION)'.
+XEmacs $(XEMACS_VERSION_STRING) $(xemacs_codename:"=\") $(xemacs_extra_name:"=\") configured for `$(EMACS_CONFIGURATION)'.
 
   Building XEmacs using \"$(MAKE:\=\\)\".
   Building XEmacs using make flags \"$(MAKEFLAGS)\".