diff options
| author | Geoff Voelker | 1995-05-09 02:25:50 +0000 |
|---|---|---|
| committer | Geoff Voelker | 1995-05-09 02:25:50 +0000 |
| commit | efdeeb2b7829d7e154a839696f5f66b05f425b41 (patch) | |
| tree | 688a8c9b17993bd43dd652a6e23f37607a576404 | |
| parent | 8993dbcd7f69a5beeb3cf8dd0b154af6378a342d (diff) | |
| download | emacs-efdeeb2b7829d7e154a839696f5f66b05f425b41.tar.gz emacs-efdeeb2b7829d7e154a839696f5f66b05f425b41.zip | |
removed ^Ms
| -rw-r--r-- | nt/_emacs | 6 | ||||
| -rwxr-xr-x | nt/ebuild.bat | 2 | ||||
| -rwxr-xr-x | nt/emacs.bat | 36 | ||||
| -rwxr-xr-x | nt/fast-install.bat | 2 | ||||
| -rw-r--r-- | nt/inc/pwd.h | 36 | ||||
| -rw-r--r-- | nt/inc/sys/file.h | 10 | ||||
| -rw-r--r-- | nt/inc/sys/ioctl.h | 10 | ||||
| -rw-r--r-- | nt/inc/sys/param.h | 20 | ||||
| -rwxr-xr-x | nt/install.bat | 2 | ||||
| -rw-r--r-- | nt/makefile.def | 184 | ||||
| -rw-r--r-- | nt/makefile.nt | 166 | ||||
| -rw-r--r-- | nt/paths.h | 92 |
12 files changed, 283 insertions, 283 deletions
| @@ -1,3 +1,3 @@ | |||
| 1 | ;;; This is the user emacs startup file (.emacs in Unix land). | 1 | ;;; This is the user emacs startup file (.emacs in Unix land). |
| 2 | 2 | ||
| 3 | (put 'eval-expression 'disabled nil) | 3 | (put 'eval-expression 'disabled nil) |
diff --git a/nt/ebuild.bat b/nt/ebuild.bat index 32cea5af9fa..6b5247cf2cc 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 c822617d4f2..36c31ee83f6 100755 --- a/nt/emacs.bat +++ b/nt/emacs.bat | |||
| @@ -1,18 +1,18 @@ | |||
| 1 | 1 | ||
| 2 | set emacs_path=\emacs | 2 | set emacs_path=\emacs |
| 3 | 3 | ||
| 4 | @echo off | 4 | @echo off |
| 5 | 5 | ||
| 6 | set EMACSLOADPATH=%emacs_path%\lisp | 6 | set EMACSLOADPATH=%emacs_path%\lisp |
| 7 | set SHELL=cmd | 7 | set SHELL=cmd |
| 8 | set EMACSDATA=%emacs_path%\etc | 8 | set EMACSDATA=%emacs_path%\etc |
| 9 | set EMACSPATH=%emacs_path%\bin | 9 | set EMACSPATH=%emacs_path%\bin |
| 10 | set EMACSLOCKDIR=%emacs_path%\lock | 10 | set EMACSLOCKDIR=%emacs_path%\lock |
| 11 | set INFOPATH=%emacs_path%\info | 11 | set INFOPATH=%emacs_path%\info |
| 12 | set EMACSDOC=%emacs_path%\etc | 12 | set EMACSDOC=%emacs_path%\etc |
| 13 | set TERM=CMD | 13 | set TERM=CMD |
| 14 | 14 | ||
| 15 | rem To find the ~\_emacs file | 15 | rem To find the ~\_emacs file |
| 16 | set HOME=%emacs_path%\nt | 16 | set HOME=%emacs_path%\nt |
| 17 | 17 | ||
| 18 | %emacs_path%\bin\emacs.exe %1 %2 %3 %4 %5 %6 %7 %8 %9 | 18 | %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 157c4ab8751..072a59061f7 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/inc/pwd.h b/nt/inc/pwd.h index 2361d52248c..6202ccd1e75 100644 --- a/nt/inc/pwd.h +++ b/nt/inc/pwd.h | |||
| @@ -1,18 +1,18 @@ | |||
| 1 | #ifndef _PWD_H_ | 1 | #ifndef _PWD_H_ |
| 2 | #define _PWD_H_ | 2 | #define _PWD_H_ |
| 3 | /* | 3 | /* |
| 4 | * pwd.h doesn't exist on NT, so we put together our own. | 4 | * pwd.h doesn't exist on NT, so we put together our own. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | struct passwd { | 7 | struct passwd { |
| 8 | char *pw_name; | 8 | char *pw_name; |
| 9 | char *pw_passwd; | 9 | char *pw_passwd; |
| 10 | int pw_uid; | 10 | int pw_uid; |
| 11 | int pw_gid; | 11 | int pw_gid; |
| 12 | int pw_quota; | 12 | int pw_quota; |
| 13 | char *pw_gecos; | 13 | char *pw_gecos; |
| 14 | char *pw_dir; | 14 | char *pw_dir; |
| 15 | char *pw_shell; | 15 | char *pw_shell; |
| 16 | }; | 16 | }; |
| 17 | 17 | ||
| 18 | #endif /* _PWD_H_ */ | 18 | #endif /* _PWD_H_ */ |
diff --git a/nt/inc/sys/file.h b/nt/inc/sys/file.h index 698dc7861c9..f84e2b34811 100644 --- a/nt/inc/sys/file.h +++ b/nt/inc/sys/file.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * sys\file.h doesn't exist on NT...rather than including it conditionally | 2 | * sys\file.h doesn't exist on NT...rather than including it conditionally |
| 3 | * in some of the source files, we just extend the include path so that the | 3 | * in some of the source files, we just extend the include path so that the |
| 4 | * compiler will pick up this empty header instead. | 4 | * compiler will pick up this empty header instead. |
| 5 | */ | 5 | */ |
diff --git a/nt/inc/sys/ioctl.h b/nt/inc/sys/ioctl.h index 5294e1b5f85..dc0957873da 100644 --- a/nt/inc/sys/ioctl.h +++ b/nt/inc/sys/ioctl.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * sys\ioctl.h doesn't exist on NT...rather than including it conditionally | 2 | * sys\ioctl.h doesn't exist on NT...rather than including it conditionally |
| 3 | * in many of the source files, we just extend the include path so that the | 3 | * in many of the source files, we just extend the include path so that the |
| 4 | * compiler will pick this up empty header instead. | 4 | * compiler will pick this up empty header instead. |
| 5 | */ | 5 | */ |
diff --git a/nt/inc/sys/param.h b/nt/inc/sys/param.h index b7f227405f4..397c5ffae66 100644 --- a/nt/inc/sys/param.h +++ b/nt/inc/sys/param.h | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | #ifndef _PARAM_H_ | 1 | #ifndef _PARAM_H_ |
| 2 | #define _PARAM_H_ | 2 | #define _PARAM_H_ |
| 3 | 3 | ||
| 4 | /* | 4 | /* |
| 5 | * sys\param.h doesn't exist on NT, so we'll make one. | 5 | * sys\param.h doesn't exist on NT, so we'll make one. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #define NBPG 4096 | 8 | #define NBPG 4096 |
| 9 | 9 | ||
| 10 | #endif /* _PARAM_H_ */ | 10 | #endif /* _PARAM_H_ */ |
diff --git a/nt/install.bat b/nt/install.bat index 997702b34ca..551d9aae2c3 100755 --- a/nt/install.bat +++ b/nt/install.bat | |||
| @@ -1 +1 @@ | |||
| nmake -f makefile.nt install | nmake -f makefile.nt install | ||
diff --git a/nt/makefile.def b/nt/makefile.def index f83143bf6a9..f1cfd80e6eb 100644 --- a/nt/makefile.def +++ b/nt/makefile.def | |||
| @@ -1,92 +1,92 @@ | |||
| 1 | # | 1 | # |
| 2 | # Makefile definition file for building GNU Emacs on Windows NT | 2 | # Makefile definition file for building GNU Emacs on Windows NT |
| 3 | # | 3 | # |
| 4 | # GNU Emacs is free software; you can redistribute it and/or modify | 4 | # GNU Emacs is free software; you can redistribute it and/or modify |
| 5 | # it under the terms of the GNU General Public License as published by | 5 | # it under the terms of the GNU General Public License as published by |
| 6 | # the Free Software Foundation; either version 2, or (at your option) | 6 | # the Free Software Foundation; either version 2, or (at your option) |
| 7 | # any later version. | 7 | # any later version. |
| 8 | # | 8 | # |
| 9 | # GNU Emacs is distributed in the hope that it will be useful, | 9 | # GNU Emacs is distributed in the hope that it will be useful, |
| 10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 | # GNU General Public License for more details. | 12 | # GNU General Public License for more details. |
| 13 | # | 13 | # |
| 14 | # You should have received a copy of the GNU General Public License | 14 | # You should have received a copy of the GNU General Public License |
| 15 | # along with GNU Emacs; see the file COPYING. If not, write to | 15 | # along with GNU Emacs; see the file COPYING. If not, write to |
| 16 | # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | 16 | # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ |
| 17 | # | 17 | # |
| 18 | # Geoff Voelker (voelker@cs.washington.edu) 9-6-94 | 18 | # Geoff Voelker (voelker@cs.washington.edu) 9-6-94 |
| 19 | 19 | ||
| 20 | # | 20 | # |
| 21 | # BEGIN CONFIGURATION | 21 | # BEGIN CONFIGURATION |
| 22 | # | 22 | # |
| 23 | 23 | ||
| 24 | # | 24 | # |
| 25 | # Set ARCH to the architecture on which you're building (i386, mips, alpha). | 25 | # Set ARCH to the architecture on which you're building (i386, mips, alpha). |
| 26 | # Set SYS_INC_DIR and SYS_LIB_DIR to your system include and library dirs. | 26 | # Set SYS_INC_DIR and SYS_LIB_DIR to your system include and library dirs. |
| 27 | # | 27 | # |
| 28 | 28 | ||
| 29 | ARCH = mips | 29 | ARCH = mips |
| 30 | SYS_INC_DIR = C:\mstools\h | 30 | SYS_INC_DIR = C:\mstools\h |
| 31 | SYS_LIB_DIR = C:\mstools\lib | 31 | SYS_LIB_DIR = C:\mstools\lib |
| 32 | 32 | ||
| 33 | # Set this to be the directory into which you want emacs installed | 33 | # Set this to be the directory into which you want emacs installed |
| 34 | INSTALL_DIR = C:\emacs | 34 | INSTALL_DIR = C:\emacs |
| 35 | 35 | ||
| 36 | # May need to be cl386.exe when using the SDK on an x86. | 36 | # May need to be cl386.exe when using the SDK on an x86. |
| 37 | CC = cl.exe | 37 | CC = cl.exe |
| 38 | 38 | ||
| 39 | # May need to be lib32.exe on NT 3.1, lib.exe on NT 3.5 | 39 | # May need to be lib32.exe on NT 3.1, lib.exe on NT 3.5 |
| 40 | AR = lib32.exe | 40 | AR = lib32.exe |
| 41 | 41 | ||
| 42 | MAKE = nmake.exe | 42 | MAKE = nmake.exe |
| 43 | LINK = link32.exe | 43 | LINK = link32.exe |
| 44 | 44 | ||
| 45 | # If you are using VC 2.0, define COMPAT_LIB (only tested on i386) | 45 | # If you are using VC 2.0, define COMPAT_LIB (only tested on i386) |
| 46 | #COMPAT_LIB = $(SYS_LIB_DIR)\oldnames.lib | 46 | #COMPAT_LIB = $(SYS_LIB_DIR)\oldnames.lib |
| 47 | 47 | ||
| 48 | CVTRES = cvtres.exe | 48 | CVTRES = cvtres.exe |
| 49 | 49 | ||
| 50 | # | 50 | # |
| 51 | # END CONFIGURATION | 51 | # END CONFIGURATION |
| 52 | # | 52 | # |
| 53 | # You shouldn't have to change any of the below to get emacs to build and | 53 | # You shouldn't have to change any of the below to get emacs to build and |
| 54 | # install on your system. If you did have to make changes, let me know. | 54 | # install on your system. If you did have to make changes, let me know. |
| 55 | # | 55 | # |
| 56 | 56 | ||
| 57 | INC = -I. -I$(SYS_INC_DIR) -I$(SYS_INC_DIR)\crt | 57 | INC = -I. -I$(SYS_INC_DIR) -I$(SYS_INC_DIR)\crt |
| 58 | CFLAGS = -nologo $(INC) $(ARCH_CFLAGS) $(LOCAL_FLAGS) -DWIN32_LEAN_AND_MEAN -D$(ARCH) | 58 | CFLAGS = -nologo $(INC) $(ARCH_CFLAGS) $(LOCAL_FLAGS) -DWIN32_LEAN_AND_MEAN -D$(ARCH) |
| 59 | 59 | ||
| 60 | OBJDIR = obj | 60 | OBJDIR = obj |
| 61 | $(OBJDIR):; -mkdir $(OBJDIR) | 61 | $(OBJDIR):; -mkdir $(OBJDIR) |
| 62 | BLD = $(OBJDIR)\$(ARCH) | 62 | BLD = $(OBJDIR)\$(ARCH) |
| 63 | $(BLD): $(OBJDIR) | 63 | $(BLD): $(OBJDIR) |
| 64 | -mkdir $(BLD) | 64 | -mkdir $(BLD) |
| 65 | 65 | ||
| 66 | CP = copy | 66 | CP = copy |
| 67 | CP_DIR = xcopy /fried | 67 | CP_DIR = xcopy /fried |
| 68 | 68 | ||
| 69 | # This is completely braindamaged, but it's the only routine known to be there | 69 | # This is completely braindamaged, but it's the only routine known to be there |
| 70 | DEL_TREE = echo y | rmdir /s | 70 | DEL_TREE = echo y | rmdir /s |
| 71 | 71 | ||
| 72 | !IF "$(ARCH)" == "i386" | 72 | !IF "$(ARCH)" == "i386" |
| 73 | ARCH_CFLAGS = -nologo -D_X86_=1 -c -Zel -W2 -H63 -G3d -Zi -Od | 73 | ARCH_CFLAGS = -nologo -D_X86_=1 -c -Zel -W2 -H63 -G3d -Zi -Od |
| 74 | ARCH_LDFLAGS = -align:0x1000 | 74 | ARCH_LDFLAGS = -align:0x1000 |
| 75 | 75 | ||
| 76 | !ELSE | 76 | !ELSE |
| 77 | !IF "$(ARCH)" == "mips" | 77 | !IF "$(ARCH)" == "mips" |
| 78 | CC = mcl.exe | 78 | CC = mcl.exe |
| 79 | ARCH_CFLAGS = -D_MIPS_=1 -c -W2 -Zi -Od -Gt0 -D__stdcall= -D__cdecl= | 79 | ARCH_CFLAGS = -D_MIPS_=1 -c -W2 -Zi -Od -Gt0 -D__stdcall= -D__cdecl= |
| 80 | ARCH_LDFLAGS = -align:0x1000 | 80 | ARCH_LDFLAGS = -align:0x1000 |
| 81 | 81 | ||
| 82 | !ELSE | 82 | !ELSE |
| 83 | !IF "$(ARCH)" == "alpha" | 83 | !IF "$(ARCH)" == "alpha" |
| 84 | CC = claxp.exe | 84 | CC = claxp.exe |
| 85 | ARCH_CFLAGS = -D_ALPHA_=1 -c -Ze -Zi -W2 -D__stdcall= -D__cdecl= | 85 | ARCH_CFLAGS = -D_ALPHA_=1 -c -Ze -Zi -W2 -D__stdcall= -D__cdecl= |
| 86 | ARCH_LDFLAGS = -align:0x2000 | 86 | ARCH_LDFLAGS = -align:0x2000 |
| 87 | 87 | ||
| 88 | !ELSE | 88 | !ELSE |
| 89 | !ERROR Unknown architecture type. | 89 | !ERROR Unknown architecture type. |
| 90 | !ENDIF | 90 | !ENDIF |
| 91 | !ENDIF | 91 | !ENDIF |
| 92 | !ENDIF | 92 | !ENDIF |
diff --git a/nt/makefile.nt b/nt/makefile.nt index 6dbf61e16e6..82372fa2989 100644 --- a/nt/makefile.nt +++ b/nt/makefile.nt | |||
| @@ -1,83 +1,83 @@ | |||
| 1 | # | 1 | # |
| 2 | # Top level makefile for building GNU Emacs on Windows NT | 2 | # Top level makefile for building GNU Emacs on Windows NT |
| 3 | # | 3 | # |
| 4 | # This file is part of GNU Emacs. | 4 | # This file is part of GNU Emacs. |
| 5 | # | 5 | # |
| 6 | # GNU Emacs is free software; you can redistribute it and/or modify | 6 | # GNU Emacs is free software; you can redistribute it and/or modify |
| 7 | # it under the terms of the GNU General Public License as published by | 7 | # it under the terms of the GNU General Public License as published by |
| 8 | # the Free Software Foundation; either version 2, or (at your option) | 8 | # the Free Software Foundation; either version 2, or (at your option) |
| 9 | # any later version. | 9 | # any later version. |
| 10 | # | 10 | # |
| 11 | # GNU Emacs is distributed in the hope that it will be useful, | 11 | # GNU Emacs is distributed in the hope that it will be useful, |
| 12 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 13 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 14 | # GNU General Public License for more details. | 14 | # GNU General Public License for more details. |
| 15 | # | 15 | # |
| 16 | # You should have received a copy of the GNU General Public License | 16 | # You should have received a copy of the GNU General Public License |
| 17 | # along with GNU Emacs; see the file COPYING. If not, write to | 17 | # along with GNU Emacs; see the file COPYING. If not, write to |
| 18 | # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | 18 | # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ |
| 19 | # | 19 | # |
| 20 | # Geoff Voelker (voelker@cs.washington.edu) 11-20-93 | 20 | # Geoff Voelker (voelker@cs.washington.edu) 11-20-93 |
| 21 | # 9-6-94 | 21 | # 9-6-94 |
| 22 | !include makefile.def | 22 | !include makefile.def |
| 23 | 23 | ||
| 24 | SUBDIRS = lib-src src lisp | 24 | SUBDIRS = lib-src src lisp |
| 25 | 25 | ||
| 26 | # | 26 | # |
| 27 | # Build emacs | 27 | # Build emacs |
| 28 | # | 28 | # |
| 29 | all:; for %%f in ( $(SUBDIRS) ) do cd ..\%%f & $(MAKE) -f makefile.nt all | 29 | all:; for %%f in ( $(SUBDIRS) ) do cd ..\%%f & $(MAKE) -f makefile.nt all |
| 30 | 30 | ||
| 31 | # | 31 | # |
| 32 | # Build and install emacs in INSTALL_DIR | 32 | # Build and install emacs in INSTALL_DIR |
| 33 | # | 33 | # |
| 34 | install: all | 34 | install: all |
| 35 | - mkdir $(INSTALL_DIR) | 35 | - mkdir $(INSTALL_DIR) |
| 36 | for %%f in ( $(SUBDIRS) ) do cd ..\%%f & $(MAKE) -f makefile.nt install | 36 | for %%f in ( $(SUBDIRS) ) do cd ..\%%f & $(MAKE) -f makefile.nt install |
| 37 | - $(CP) emacs.bat $(INSTALL_DIR)\bin | 37 | - $(CP) emacs.bat $(INSTALL_DIR)\bin |
| 38 | - del /q ..\same-dir.tst | 38 | - del /q ..\same-dir.tst |
| 39 | - del /q $(INSTALL_DIR)\same-dir.tst | 39 | - del /q $(INSTALL_DIR)\same-dir.tst |
| 40 | echo SameDirTest > ..\same-dir.tst | 40 | echo SameDirTest > ..\same-dir.tst |
| 41 | if not exist $(INSTALL_DIR)\same-dir.tst $(MAKE) -f makefile.nt real_install | 41 | if not exist $(INSTALL_DIR)\same-dir.tst $(MAKE) -f makefile.nt real_install |
| 42 | - del /q ..\same-dir.tst | 42 | - del /q ..\same-dir.tst |
| 43 | - del /q $(INSTALL_DIR)\same-dir.tst | 43 | - del /q $(INSTALL_DIR)\same-dir.tst |
| 44 | 44 | ||
| 45 | # | 45 | # |
| 46 | # This installs executables from ..\bin into the installation directory | 46 | # This installs executables from ..\bin into the installation directory |
| 47 | # without building anything. | 47 | # without building anything. |
| 48 | # | 48 | # |
| 49 | fast_install: | 49 | fast_install: |
| 50 | - mkdir $(INSTALL_DIR)\data | 50 | - mkdir $(INSTALL_DIR)\data |
| 51 | $(CP) ..\lib-src\DOC $(INSTALL_DIR)\etc | 51 | $(CP) ..\lib-src\DOC $(INSTALL_DIR)\etc |
| 52 | - mkdir $(INSTALL_DIR)\bin | 52 | - mkdir $(INSTALL_DIR)\bin |
| 53 | - $(CP) emacs.bat $(INSTALL_DIR)\bin | 53 | - $(CP) emacs.bat $(INSTALL_DIR)\bin |
| 54 | - del /q ..\same-dir.tst | 54 | - del /q ..\same-dir.tst |
| 55 | - del /q $(INSTALL_DIR)\same-dir.tst | 55 | - del /q $(INSTALL_DIR)\same-dir.tst |
| 56 | echo SameDirTest > ..\same-dir.tst | 56 | echo SameDirTest > ..\same-dir.tst |
| 57 | if not exist $(INSTALL_DIR)\same-dir.tst $(CP) ..\bin\emacs.exe $(INSTALL_DIR)\bin | 57 | if not exist $(INSTALL_DIR)\same-dir.tst $(CP) ..\bin\emacs.exe $(INSTALL_DIR)\bin |
| 58 | if not exist $(INSTALL_DIR)\same-dir.tst $(CP) ..\bin\etags.exe $(INSTALL_DIR)\bin | 58 | if not exist $(INSTALL_DIR)\same-dir.tst $(CP) ..\bin\etags.exe $(INSTALL_DIR)\bin |
| 59 | if not exist $(INSTALL_DIR)\same-dir.tst $(CP) ..\bin\ctags.exe $(INSTALL_DIR)\bin | 59 | if not exist $(INSTALL_DIR)\same-dir.tst $(CP) ..\bin\ctags.exe $(INSTALL_DIR)\bin |
| 60 | if not exist $(INSTALL_DIR)\same-dir.tst nmake -f $(MAKE) real_install | 60 | if not exist $(INSTALL_DIR)\same-dir.tst nmake -f $(MAKE) real_install |
| 61 | - del /q ..\same-dir.tst | 61 | - del /q ..\same-dir.tst |
| 62 | - del /q $(INSTALL_DIR)\same-dir.tst | 62 | - del /q $(INSTALL_DIR)\same-dir.tst |
| 63 | 63 | ||
| 64 | real_install: | 64 | real_install: |
| 65 | - del /q ..\same-dir.tst | 65 | - del /q ..\same-dir.tst |
| 66 | - del /q $(INSTALL_DIR)\same-dir.tst | 66 | - del /q $(INSTALL_DIR)\same-dir.tst |
| 67 | echo SameDirTest > ..\same-dir.tst | 67 | echo SameDirTest > ..\same-dir.tst |
| 68 | - mkdir $(INSTALL_DIR)\etc | 68 | - mkdir $(INSTALL_DIR)\etc |
| 69 | - mkdir $(INSTALL_DIR)\info | 69 | - mkdir $(INSTALL_DIR)\info |
| 70 | - mkdir $(INSTALL_DIR)\lock | 70 | - mkdir $(INSTALL_DIR)\lock |
| 71 | - mkdir $(INSTALL_DIR)\data | 71 | - mkdir $(INSTALL_DIR)\data |
| 72 | if not exist $(INSTALL_DIR)\nt\same-dir.tst $(CP_DIR) ..\etc $(INSTALL_DIR)\etc | 72 | if not exist $(INSTALL_DIR)\nt\same-dir.tst $(CP_DIR) ..\etc $(INSTALL_DIR)\etc |
| 73 | if not exist $(INSTALL_DIR)\nt\same-dir.tst $(CP_DIR) ..\info $(INSTALL_DIR)\info | 73 | if not exist $(INSTALL_DIR)\nt\same-dir.tst $(CP_DIR) ..\info $(INSTALL_DIR)\info |
| 74 | - del /q ..\same-dir.tst | 74 | - del /q ..\same-dir.tst |
| 75 | - del /q $(INSTALL_DIR)\same-dir.tst | 75 | - del /q $(INSTALL_DIR)\same-dir.tst |
| 76 | 76 | ||
| 77 | # | 77 | # |
| 78 | # Maintenance | 78 | # Maintenance |
| 79 | # | 79 | # |
| 80 | clean:; - del /q /s *~ | 80 | clean:; - del /q /s *~ |
| 81 | - $(DEL_TREE) deleted | 81 | - $(DEL_TREE) deleted |
| 82 | - $(DEL_TREE) ..\bin | 82 | - $(DEL_TREE) ..\bin |
| 83 | for %%f in ( $(SUBDIRS) ) do cd ..\%%f & $(MAKE) -f makefile.nt clean | 83 | for %%f in ( $(SUBDIRS) ) do cd ..\%%f & $(MAKE) -f makefile.nt clean |
diff --git a/nt/paths.h b/nt/paths.h index 9269bd4f576..f8a91e837cd 100644 --- a/nt/paths.h +++ b/nt/paths.h | |||
| @@ -1,46 +1,46 @@ | |||
| 1 | /* Hey Emacs, this is -*- C -*- code! */ | 1 | /* Hey Emacs, this is -*- C -*- code! */ |
| 2 | 2 | ||
| 3 | /* Backslashify the default paths for NT */ | 3 | /* Backslashify the default paths for NT */ |
| 4 | 4 | ||
| 5 | /* The default search path for Lisp function "load". | 5 | /* The default search path for Lisp function "load". |
| 6 | This sets load-path. */ | 6 | This sets load-path. */ |
| 7 | /* #define PATH_LOADSEARCH "/usr/local/lib/emacs/lisp" */ | 7 | /* #define PATH_LOADSEARCH "/usr/local/lib/emacs/lisp" */ |
| 8 | #define PATH_LOADSEARCH "C:\\emacs\\lisp" | 8 | #define PATH_LOADSEARCH "C:\\emacs\\lisp" |
| 9 | 9 | ||
| 10 | /* Like PATH_LOADSEARCH, but used only when Emacs is dumping. This | 10 | /* Like PATH_LOADSEARCH, but used only when Emacs is dumping. This |
| 11 | path is usually identical to PATH_LOADSEARCH except that the entry | 11 | path is usually identical to PATH_LOADSEARCH except that the entry |
| 12 | for the directory containing the installed lisp files has been | 12 | for the directory containing the installed lisp files has been |
| 13 | replaced with ../lisp. */ | 13 | replaced with ../lisp. */ |
| 14 | /* #define PATH_DUMPLOADSEARCH "../lisp" */ | 14 | /* #define PATH_DUMPLOADSEARCH "../lisp" */ |
| 15 | #define PATH_DUMPLOADSEARCH "..\\..\\..\\lisp" | 15 | #define PATH_DUMPLOADSEARCH "..\\..\\..\\lisp" |
| 16 | 16 | ||
| 17 | /* The extra search path for programs to invoke. This is appended to | 17 | /* The extra search path for programs to invoke. This is appended to |
| 18 | whatever the PATH environment variable says to set the Lisp | 18 | whatever the PATH environment variable says to set the Lisp |
| 19 | variable exec-path and the first file name in it sets the Lisp | 19 | variable exec-path and the first file name in it sets the Lisp |
| 20 | variable exec-directory. exec-directory is used for finding | 20 | variable exec-directory. exec-directory is used for finding |
| 21 | executables and other architecture-dependent files. */ | 21 | executables and other architecture-dependent files. */ |
| 22 | /* #define PATH_EXEC "/usr/local/lib/emacs/etc" */ | 22 | /* #define PATH_EXEC "/usr/local/lib/emacs/etc" */ |
| 23 | #define PATH_EXEC "C:\\emacs\\bin" | 23 | #define PATH_EXEC "C:\\emacs\\bin" |
| 24 | 24 | ||
| 25 | /* Where Emacs should look for its architecture-independent data | 25 | /* Where Emacs should look for its architecture-independent data |
| 26 | files, like the NEWS file. The lisp variable data-directory | 26 | files, like the NEWS file. The lisp variable data-directory |
| 27 | is set to this value. */ | 27 | is set to this value. */ |
| 28 | /* #define PATH_DATA "/usr/local/lib/emacs/data" */ | 28 | /* #define PATH_DATA "/usr/local/lib/emacs/data" */ |
| 29 | #define PATH_DATA "C:\\emacs\\data" | 29 | #define PATH_DATA "C:\\emacs\\data" |
| 30 | 30 | ||
| 31 | /* Where Emacs should look for its docstring file. The lisp variable | 31 | /* Where Emacs should look for its docstring file. The lisp variable |
| 32 | doc-directory is set to this value. */ | 32 | doc-directory is set to this value. */ |
| 33 | #define PATH_DOC "C:\\emacs\\etc" | 33 | #define PATH_DOC "C:\\emacs\\etc" |
| 34 | 34 | ||
| 35 | /* The name of the directory that contains lock files with which we | 35 | /* The name of the directory that contains lock files with which we |
| 36 | record what files are being modified in Emacs. This directory | 36 | record what files are being modified in Emacs. This directory |
| 37 | should be writable by everyone. THE STRING MUST END WITH A | 37 | should be writable by everyone. THE STRING MUST END WITH A |
| 38 | SLASH!!! */ | 38 | SLASH!!! */ |
| 39 | /* #define PATH_LOCK "/usr/local/lib/emacs/lock/" */ | 39 | /* #define PATH_LOCK "/usr/local/lib/emacs/lock/" */ |
| 40 | #define PATH_LOCK "C:\\emacs\\lock\\" | 40 | #define PATH_LOCK "C:\\emacs\\lock\\" |
| 41 | 41 | ||
| 42 | /* Where the configuration process believes the info tree lives. The | 42 | /* Where the configuration process believes the info tree lives. The |
| 43 | lisp variable configure-info-directory gets its value from this | 43 | lisp variable configure-info-directory gets its value from this |
| 44 | macro, and is then used to set the Info-default-directory-list. */ | 44 | macro, and is then used to set the Info-default-directory-list. */ |
| 45 | /* #define PATH_INFO "/usr/local/info" */ | 45 | /* #define PATH_INFO "/usr/local/info" */ |
| 46 | #define PATH_INFO "C:\\emacs\\info" | 46 | #define PATH_INFO "C:\\emacs\\info" |