comparison nt/xemacs.mak @ 2106:e0cad74058ab

[xemacs-hg @ 2004-05-31 23:41:30 by adrian] xemacs-21.5: Handle xemacs_extra_name in xemacs.mak, improve copy -------------------- ChangeLog entries follow: -------------------- nt/ChangeLog addition: 2004-06-01 Adrian Aichner <adrian@xemacs.org> * xemacs.mak: Don't echo DEL command. Use COPYCMD everywhere. Remove /r switch from COPY and COPYDIR, as environment variable COPYCMD takes care of this. * xemacs.mak (COPYCMD): New. Used to initialize environment variable by same name. * xemacs.mak (TEMACS_CPP_FLAGS_NO_CFLAGS): Handle xemacs_extra_name (CVS date stamp).
author adrian
date Mon, 31 May 2004 23:41:30 +0000
parents 39ed74ae932b
children ee2db3cf5512
comparison
equal deleted inserted replaced
2105:4a21fdd04a5f 2106:e0cad74058ab
40 ########################### Common commands. 40 ########################### Common commands.
41 41
42 # Put these before including config.inc so they can be overridden there. 42 # Put these before including config.inc so they can be overridden there.
43 # Note that some versions of some commands are deficient. 43 # Note that some versions of some commands are deficient.
44 44
45 # Define the 'del' command to use 45 # Define a variable for the 'del' command to use.
46 # WinME's DEL command can only handle one argument and only has the /P flag. 46 # WinME's DEL command can only handle one argument and only has the /P flag.
47 # So only delete one glob at a time. Override flags in config.inc. 47 # So only delete one glob at a time. Override flags in config.inc.
48 DEL=del 48 DEL=-del
49 49
50 # Tell COPY, MOVE, and XCOPY to suppress confirmation for overwriting 50 # Tell COPY, MOVE, and XCOPY to suppress confirmation for overwriting
51 # files. 51 # files.
52 # set COPYCMD=/y 52 COPYCMD=/y
53 # Define the 'copy' command to use. 53 # Define the 'copy' command to use.
54 # Use /r (instead of /y), which exists on Windows NT 4 and 5. 54 COPY=xcopy /q
55 COPY=xcopy /q /r 55 COPYDIR=xcopy /q /e
56 COPYDIR=xcopy /q /r /e
57 56
58 ########################### Includes, and source and build tree determination. 57 ########################### Includes, and source and build tree determination.
59 58
60 !include "config.inc" 59 !include "config.inc"
61 60
629 $(INCLUDES) $(DEFINES) \ 628 $(INCLUDES) $(DEFINES) \
630 -DEMACS_MAJOR_VERSION=$(emacs_major_version) \ 629 -DEMACS_MAJOR_VERSION=$(emacs_major_version) \
631 -DEMACS_MINOR_VERSION=$(emacs_minor_version) \ 630 -DEMACS_MINOR_VERSION=$(emacs_minor_version) \
632 $(EMACS_BETA_VERSION) $(EMACS_PATCH_LEVEL) \ 631 $(EMACS_BETA_VERSION) $(EMACS_PATCH_LEVEL) \
633 -DXEMACS_CODENAME=\"$(xemacs_codename:&=and)\" \ 632 -DXEMACS_CODENAME=\"$(xemacs_codename:&=and)\" \
633 !if defined(xemacs_extra_name)
634 -DXEMACS_EXTRA_NAME=\"$(xemacs_extra_name:"=)\" \
635 !endif
634 -DEMACS_CONFIGURATION=\"$(EMACS_CONFIGURATION)\" \ 636 -DEMACS_CONFIGURATION=\"$(EMACS_CONFIGURATION)\" \
635 -DPATH_PACKAGEPATH=\"$(PATH_PACKAGEPATH)\" 637 -DPATH_PACKAGEPATH=\"$(PATH_PACKAGEPATH)\"
636 TEMACS_CPP_FLAGS=$(CFLAGS) $(TEMACS_CPP_FLAGS_NO_CFLAGS) 638 TEMACS_CPP_FLAGS=$(CFLAGS) $(TEMACS_CPP_FLAGS_NO_CFLAGS)
637 TEMACS_CPP_CDECL_FLAGS=$(CFLAGS_CDECL) $(TEMACS_CPP_FLAGS_NO_CFLAGS) 639 TEMACS_CPP_CDECL_FLAGS=$(CFLAGS_CDECL) $(TEMACS_CPP_FLAGS_NO_CFLAGS)
638 640
820 $(SRC)\config.h: $(SRC)\config.h.in 822 $(SRC)\config.h: $(SRC)\config.h.in
821 # #### ms must have hired monkeys to design their shell commands. if 823 # #### ms must have hired monkeys to design their shell commands. if
822 # #### you use xcopy to copy a file from one name to another, it 824 # #### you use xcopy to copy a file from one name to another, it
823 # #### PROMPTS you to see if you meant the second as a directory! and 825 # #### PROMPTS you to see if you meant the second as a directory! and
824 # #### no switch to mean "no of course, you idiots, it's a file!" 826 # #### no switch to mean "no of course, you idiots, it's a file!"
827 set COPYCMD=$(COPYCMD)
825 @copy $(SRC)\config.h.in $(SRC)\config.h 828 @copy $(SRC)\config.h.in $(SRC)\config.h
826 829
827 #$(SRC)\Emacs.ad.h: $(SRCROOT)\etc\Emacs.ad 830 #$(SRC)\Emacs.ad.h: $(SRCROOT)\etc\Emacs.ad
828 # !"sed -f ad2c.sed < $(SRCROOT)\etc\Emacs.ad > $(SRC)\Emacs.ad.h" 831 # !"sed -f ad2c.sed < $(SRCROOT)\etc\Emacs.ad > $(SRC)\Emacs.ad.h"
829 832
830 #$(SRC)\paths.h: $(SRC)\paths.h.in 833 #$(SRC)\paths.h: $(SRC)\paths.h.in
831 # !"cd $(SRC); cp paths.h.in paths.h" 834 # !"cd $(SRC); cp paths.h.in paths.h"
832 835
833 $(SRC)\Emacs.ad.h: $(NT)\Emacs.ad.h 836 $(SRC)\Emacs.ad.h: $(NT)\Emacs.ad.h
834 set COPYCMD=/y 837 set COPYCMD=$(COPYCMD)
835 @$(COPY) $(NT)\Emacs.ad.h $(SRC) 838 @$(COPY) $(NT)\Emacs.ad.h $(SRC)
836 839
837 $(SRC)\paths.h: $(NT)\paths.h 840 $(SRC)\paths.h: $(NT)\paths.h
838 set COPYCMD=/y 841 set COPYCMD=$(COPYCMD)
839 @$(COPY) $(NT)\paths.h $(SRC) 842 @$(COPY) $(NT)\paths.h $(SRC)
840 843
841 844
842 ###################### lastfile.lib 845 ###################### lastfile.lib
843 846
1441 ########################### Install the system 1444 ########################### Install the system
1442 1445
1443 # use this rule to install the system 1446 # use this rule to install the system
1444 install: all 1447 install: all
1445 cd $(NT) 1448 cd $(NT)
1446 set COPYCMD=/y 1449 set COPYCMD=$(COPYCMD)
1447 @echo Installing in $(INSTALL_DIR) ... 1450 @echo Installing in $(INSTALL_DIR) ...
1448 @echo PlaceHolder > PlaceHolder 1451 @echo PlaceHolder > PlaceHolder
1449 @$(COPY) $(SRCROOT)\PROBLEMS "$(INSTALL_DIR)\" 1452 @$(COPY) $(SRCROOT)\PROBLEMS "$(INSTALL_DIR)\"
1450 @$(COPY) PlaceHolder "$(INSTALL_DIR)\lock\" 1453 @$(COPY) PlaceHolder "$(INSTALL_DIR)\lock\"
1451 -$(DEL) "$(INSTALL_DIR)\lock\PlaceHolder" 1454 -$(DEL) "$(INSTALL_DIR)\lock\PlaceHolder"