diff options
author | Geoff Voelker <voelker@cs.washington.edu> | 1997-01-20 00:05:31 +0000 |
---|---|---|
committer | Geoff Voelker <voelker@cs.washington.edu> | 1997-01-20 00:05:31 +0000 |
commit | 276522c7f890c7c7966ebf3aca7136e64f7643ca (patch) | |
tree | 57e522cef2f3c1071d4f77c30684e3908651a6d0 /nt | |
parent | e86397b111c115667a2862c7070dd5fe2f83fac6 (diff) | |
download | emacs-276522c7f890c7c7966ebf3aca7136e64f7643ca.tar.gz |
Use windows95 and windowsnt instead
of win95 and winnt, respectively.
Diffstat (limited to 'nt')
-rw-r--r-- | nt/emacs.bat.in | 4 | ||||
-rw-r--r-- | nt/makefile.def | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nt/emacs.bat.in b/nt/emacs.bat.in index 0e594160fd8..2308c98a5f3 100644 --- a/nt/emacs.bat.in +++ b/nt/emacs.bat.in @@ -4,12 +4,12 @@ REM Here begins emacs.bat.in REM Set OS specific values.
set ARCH_SAVE=%PROCESSOR_ARCHITECTURE%
set PROCESSOR_ARCHITECTURE=
-if "%ARCH_SAVE%" == "%PROCESSOR_ARCHITECTURE%" goto win95
+if "%ARCH_SAVE%" == "%PROCESSOR_ARCHITECTURE%" goto windows95
set PROCESSOR_ARCHITECTURE=%ARCH_SAVE%
set SHELL=cmd
goto next
-:win95
+:windows95
set SHELL=command
:next
diff --git a/nt/makefile.def b/nt/makefile.def index e83b0b71b07..8d920d48ef0 100644 --- a/nt/makefile.def +++ b/nt/makefile.def @@ -58,7 +58,7 @@ MSVCNT11 = 0 # We're on Windows NT CPU = $(PROCESSOR_ARCHITECTURE) CONFIG_H = config.nt -OS_TYPE = winnt +OS_TYPE = windowsnt ! if "$(PROCESSOR_ARCHITECTURE)" == "x86" ARCH = i386 CPU = i386 @@ -82,11 +82,11 @@ ARCH = ppc ARCH = i386 CPU = i386 CONFIG_H = config.nt -OS_TYPE = win95 +OS_TYPE = windows95 !endif # Include ntwin32.mak. So far, this file seems to be supported by every -# Microsoft compiler on NT and Win95 and properly defines the executable +# Microsoft compiler on NT and Windows 95 and properly defines the executable # names and libraries necessary to build Emacs. I do not have access # to any other vendor compilers, so I do not know if they supply this # file, too. For now I'll assume that they do. @@ -153,7 +153,7 @@ $(BLD): $(OBJDIR) CP = copy CP_DIR = xcopy /f/r/i/e/d -!if "$(OS_TYPE)" == "win95" +!if "$(OS_TYPE)" == "windows95" DEL = deltree /y DEL_TREE = deltree /y !else |