aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Voelker1995-05-28 02:18:09 +0000
committerGeoff Voelker1995-05-28 02:18:09 +0000
commit8cb2d3e0cd49664c4c53b8831b7662b6568d8d76 (patch)
treeda00b9422e28c6d326bdf60ba297808b26c97a7d
parent7f0db62c95ecff38d713dc60bc80546e9aea7619 (diff)
downloademacs-8cb2d3e0cd49664c4c53b8831b7662b6568d8d76.tar.gz
emacs-8cb2d3e0cd49664c4c53b8831b7662b6568d8d76.zip
Add carriage returns; necessary for batch files on Win95
-rwxr-xr-xnt/ebuild.bat2
-rwxr-xr-xnt/emacs.bat88
-rwxr-xr-xnt/fast-install.bat2
-rwxr-xr-xnt/install.bat2
4 files changed, 47 insertions, 47 deletions
diff --git a/nt/ebuild.bat b/nt/ebuild.bat
index 6b5247cf2cc..32cea5af9fa 100755
--- a/nt/ebuild.bat
+++ b/nt/ebuild.bat
@@ -1 +1 @@
nmake -f makefile.nt all nmake -f makefile.nt all
diff --git a/nt/emacs.bat b/nt/emacs.bat
index 5c67fbca521..14e4893d6df 100755
--- a/nt/emacs.bat
+++ b/nt/emacs.bat
@@ -1,44 +1,44 @@
1@echo off 1@echo off
2 2
3REM Change this to the directory into which you installed Emacs: 3REM Change this to the directory into which you installed Emacs:
4set emacs_path=C:\emacs 4set emacs_path=C:\emacs
5 5
6REM 6REM
7REM You shouldn't have to change any of the below. 7REM You shouldn't have to change any of the below.
8REM 8REM
9 9
10REM Set OS specific values. 10REM Set OS specific values.
11set ARCH_SAVE=%PROCESSOR_ARCHITECTURE% 11set ARCH_SAVE=%PROCESSOR_ARCHITECTURE%
12set PROCESSOR_ARCHITECTURE= 12set PROCESSOR_ARCHITECTURE=
13if "%ARCH_SAVE%" == "%PROCESSOR_ARCHITECTURE%" goto win95 13if "%ARCH_SAVE%" == "%PROCESSOR_ARCHITECTURE%" goto win95
14set PROCESSOR_ARCHITECTURE=%ARCH_SAVE% 14set PROCESSOR_ARCHITECTURE=%ARCH_SAVE%
15set SHELL=cmd 15set SHELL=cmd
16goto next 16goto next
17 17
18:win95 18:win95
19set SHELL=command 19set SHELL=command
20 20
21:next 21:next
22 22
23set EMACSLOADPATH=%emacs_path%\lisp 23set EMACSLOADPATH=%emacs_path%\lisp
24set EMACSDATA=%emacs_path%\etc 24set EMACSDATA=%emacs_path%\etc
25set EMACSPATH=%emacs_path%\bin 25set EMACSPATH=%emacs_path%\bin
26set EMACSLOCKDIR=%emacs_path%\lock 26set EMACSLOCKDIR=%emacs_path%\lock
27set INFOPATH=%emacs_path%\info 27set INFOPATH=%emacs_path%\info
28set EMACSDOC=%emacs_path%\etc 28set EMACSDOC=%emacs_path%\etc
29set TERM=CMD 29set TERM=CMD
30 30
31REM The variable HOME is used to find the startup file, ~\_emacs. Ideally, 31REM The variable HOME is used to find the startup file, ~\_emacs. Ideally,
32REM this will not be set in this file but should already be set before 32REM this will not be set in this file but should already be set before
33REM this file is invoked. If HOME is not set, use some generic default. 33REM this file is invoked. If HOME is not set, use some generic default.
34 34
35set HOME_SAVE=%HOME% 35set HOME_SAVE=%HOME%
36set HOME_EXISTS=yes 36set HOME_EXISTS=yes
37set HOME_DEFAULT=C:\ 37set HOME_DEFAULT=C:\
38set HOME= 38set HOME=
39if "%HOME%" == "%HOME_SAVE%" set HOME_EXISTS=no 39if "%HOME%" == "%HOME_SAVE%" set HOME_EXISTS=no
40if "%HOME_EXISTS%" == "yes" set HOME=%HOME_SAVE% 40if "%HOME_EXISTS%" == "yes" set HOME=%HOME_SAVE%
41if "%HOME_EXISTS%" == "no" set HOME=%HOME_DEFAULT% 41if "%HOME_EXISTS%" == "no" set HOME=%HOME_DEFAULT%
42if "%HOME_EXISTS%" == "no" echo HOME is not set! Using %HOME% as a default... 42if "%HOME_EXISTS%" == "no" echo HOME is not set! Using %HOME% as a default...
43 43
44%emacs_path%\bin\emacs.exe %1 %2 %3 %4 %5 %6 %7 %8 %9 44%emacs_path%\bin\emacs.exe %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/nt/fast-install.bat b/nt/fast-install.bat
index 072a59061f7..157c4ab8751 100755
--- a/nt/fast-install.bat
+++ b/nt/fast-install.bat
@@ -1 +1 @@
nmake -f makefile.nt fast_install nmake -f makefile.nt fast_install
diff --git a/nt/install.bat b/nt/install.bat
index 551d9aae2c3..997702b34ca 100755
--- a/nt/install.bat
+++ b/nt/install.bat
@@ -1 +1 @@
nmake -f makefile.nt install nmake -f makefile.nt install