aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Voelker1998-04-24 03:26:18 +0000
committerGeoff Voelker1998-04-24 03:26:18 +0000
commitea444b40e903393b4b59b3cc516c203c5bbfb5a5 (patch)
tree72da5bf6884bdd865421716076f61f71f9f4d04f
parentc78fb6a6fb68d33409f8d4f7edd98002e46b59ef (diff)
downloademacs-ea444b40e903393b4b59b3cc516c203c5bbfb5a5.tar.gz
emacs-ea444b40e903393b4b59b3cc516c203c5bbfb5a5.zip
(emacs.bat, debug.bat): Create them in the
installation directory.
-rw-r--r--nt/makefile.nt26
1 files changed, 12 insertions, 14 deletions
diff --git a/nt/makefile.nt b/nt/makefile.nt
index e173f730833..3a9d3ce4cd6 100644
--- a/nt/makefile.nt
+++ b/nt/makefile.nt
@@ -84,23 +84,25 @@ all: $(BLD) $(ALL)
84 cd ..\nt 84 cd ..\nt
85 85
86 86
87emacs.bat: emacs.bat.in 87$(INSTALL_DIR)\bin\emacs.bat: emacs.bat.in
88 echo @echo off > emacs.bat 88 echo @echo off > $@
89 echo REM !!! Warning: This file automatically generated !!! >> emacs.bat 89 echo REM !!! Warning: This file automatically generated !!! >> emacs.bat
90 echo set emacs_dir=$(INSTALL_DIR)>> emacs.bat 90 echo set emacs_dir=$(INSTALL_DIR)>> $@
91 type emacs.bat.in >> emacs.bat 91 type emacs.bat.in >> $@
92 92
93debug.bat: debug.bat.in 93$(INSTALL_DIR)\bin\debug.bat: debug.bat.in
94 echo @echo off > debug.bat 94 echo @echo off > $@
95 echo REM !!! Warning: This file automatically generated !!! >> debug.bat 95 echo REM !!! Warning: This file automatically generated !!! >> debug.bat
96 echo set emacs_dir=$(INSTALL_DIR)>> debug.bat 96 echo set emacs_dir=$(INSTALL_DIR)>> $@
97 type debug.bat.in >> debug.bat 97 type debug.bat.in >> $@
98
99batch_files: $(INSTALL_DIR)\bin\emacs.bat $(INSTALL_DIR)\bin\debug.bat
98 100
99# 101#
100# Build and install emacs in INSTALL_DIR 102# Build and install emacs in INSTALL_DIR
101# 103#
102INSTALL_CMD = $(MAKE) -f makefile.nt install 104INSTALL_CMD = $(MAKE) -f makefile.nt install
103install: all emacs.bat debug.bat 105install: all batch_files
104 - mkdir $(INSTALL_DIR) 106 - mkdir $(INSTALL_DIR)
105 cd ..\lib-src 107 cd ..\lib-src
106 $(INSTALL_CMD) 108 $(INSTALL_CMD)
@@ -109,8 +111,6 @@ install: all emacs.bat debug.bat
109 cd ..\lisp 111 cd ..\lisp
110 $(INSTALL_CMD) 112 $(INSTALL_CMD)
111 cd ..\nt 113 cd ..\nt
112 - $(CP) emacs.bat $(INSTALL_DIR)\bin
113 - $(CP) debug.bat $(INSTALL_DIR)\bin
114 - $(CP) $(BLD)\addpm.exe $(INSTALL_DIR)\bin 114 - $(CP) $(BLD)\addpm.exe $(INSTALL_DIR)\bin
115 - $(CP) $(BLD)\ddeclient.exe $(INSTALL_DIR)\bin 115 - $(CP) $(BLD)\ddeclient.exe $(INSTALL_DIR)\bin
116 - $(CP) $(BLD)\cmdproxy.exe $(INSTALL_DIR)\bin 116 - $(CP) $(BLD)\cmdproxy.exe $(INSTALL_DIR)\bin
@@ -127,12 +127,10 @@ install: all emacs.bat debug.bat
127# This installs executables from ..\bin into the installation directory 127# This installs executables from ..\bin into the installation directory
128# without building anything. 128# without building anything.
129# 129#
130fast_install: 130fast_install: batch_files
131 - mkdir $(INSTALL_DIR)\data 131 - mkdir $(INSTALL_DIR)\data
132 $(CP) ..\lib-src\DOC $(INSTALL_DIR)\etc 132 $(CP) ..\lib-src\DOC $(INSTALL_DIR)\etc
133 - mkdir $(INSTALL_DIR)\bin 133 - mkdir $(INSTALL_DIR)\bin
134 - $(CP) emacs.bat $(INSTALL_DIR)\bin
135 - $(CP) debug.bat $(INSTALL_DIR)\bin
136 - $(CP) $(BLD)\addpm.exe $(INSTALL_DIR)\bin 134 - $(CP) $(BLD)\addpm.exe $(INSTALL_DIR)\bin
137 - $(CP) $(BLD)\runemacs.exe $(INSTALL_DIR)\bin 135 - $(CP) $(BLD)\runemacs.exe $(INSTALL_DIR)\bin
138 - $(DEL) ..\same-dir.tst 136 - $(DEL) ..\same-dir.tst