diff options
| author | Glenn Morris | 2010-05-13 21:23:23 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-13 21:23:23 -0700 |
| commit | 177b028808f53afbb49328faeb683c2dd55a1794 (patch) | |
| tree | 63c11bb2f82b546294a2ba039355a8f64cddb9ca /msdos | |
| parent | 508197067c434b0111bcb6ded742d424bb738ece (diff) | |
| download | emacs-177b028808f53afbb49328faeb683c2dd55a1794.tar.gz emacs-177b028808f53afbb49328faeb683c2dd55a1794.zip | |
No harm in always defining some ns_ Makefile variables.
* src/Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Always define.
* msdos/sed1v2.inp (ns_appdir, ns_appbindir, ns_appsrc): Edit to empty.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 2 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 780ec198d47..0c7752b0f66 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-05-14 Glenn Morris <rgm@gnu.org> | 1 | 2010-05-14 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * sed1v2.inp (ns_appdir, ns_appbindir, ns_appsrc): Edit to empty. | ||
| 4 | |||
| 3 | * sed1v2.inp (MSDOS_OBJ): Edit to dosfns.o msdos.o. | 5 | * sed1v2.inp (MSDOS_OBJ): Edit to dosfns.o msdos.o. |
| 4 | (MSDOS_SUPPORT): Edit to $(MSDOS_SUPPORT_REAL). | 6 | (MSDOS_SUPPORT): Edit to $(MSDOS_SUPPORT_REAL). |
| 5 | * sed1x.inp (MSDOS_X_OBJ): Edit to w16select.o termcap.o. | 7 | * sed1x.inp (MSDOS_X_OBJ): Edit to w16select.o termcap.o. |
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 5ebaba06f60..2d1b2bf5f59 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp | |||
| @@ -91,6 +91,9 @@ s/\.h\.in/.h-in/ | |||
| 91 | /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// | 91 | /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// |
| 92 | /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o/ | 92 | /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o/ |
| 93 | /^MSDOS_SUPPORT *=/s/= */= $(MSDOS_SUPPORT_REAL)/ | 93 | /^MSDOS_SUPPORT *=/s/= */= $(MSDOS_SUPPORT_REAL)/ |
| 94 | /^ns_appdir *=/s/@ns_appdir@// | ||
| 95 | /^ns_appbindir *=/s/@ns_appbindir@// | ||
| 96 | /^ns_appsrc *=/s/@ns_appsrc@// | ||
| 94 | /^NS_OBJ *=/s/@NS_OBJ@// | 97 | /^NS_OBJ *=/s/@NS_OBJ@// |
| 95 | /^NS_SUPPORT *=/s/@NS_SUPPORT@// | 98 | /^NS_SUPPORT *=/s/@NS_SUPPORT@// |
| 96 | /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// | 99 | /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// |