diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-13 21:23:23 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-13 21:23:23 -0700 |
| commit | 177b028808f53afbb49328faeb683c2dd55a1794 (patch) | |
| tree | 63c11bb2f82b546294a2ba039355a8f64cddb9ca | |
| parent | 508197067c434b0111bcb6ded742d424bb738ece (diff) | |
| download | emacs-177b028808f53afbb49328faeb683c2dd55a1794.tar.gz | |
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.
| -rw-r--r-- | msdos/ChangeLog | 2 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 3 | ||||
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 9 |
4 files changed, 10 insertions, 6 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 780ec198d47..0c7752b0f66 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,5 +1,7 @@ 2010-05-14 Glenn Morris <rgm@gnu.org> + * sed1v2.inp (ns_appdir, ns_appbindir, ns_appsrc): Edit to empty. + * sed1v2.inp (MSDOS_OBJ): Edit to dosfns.o msdos.o. (MSDOS_SUPPORT): Edit to $(MSDOS_SUPPORT_REAL). * 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/ /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o/ /^MSDOS_SUPPORT *=/s/= */= $(MSDOS_SUPPORT_REAL)/ +/^ns_appdir *=/s/@ns_appdir@// +/^ns_appbindir *=/s/@ns_appbindir@// +/^ns_appsrc *=/s/@ns_appsrc@// /^NS_OBJ *=/s/@NS_OBJ@// /^NS_SUPPORT *=/s/@NS_SUPPORT@// /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// diff --git a/src/ChangeLog b/src/ChangeLog index 7ffb5800753..b2e1897ca76 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -5,6 +5,8 @@ 2010-05-14 Glenn Morris <rgm@gnu.org> + * Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Always define. + * Makefile.in (mktime, X11, register): Move undefs to configure. * Makefile.in (MSDOS_OBJ): Default to empty, let msdos scripts set it. diff --git a/src/Makefile.in b/src/Makefile.in index 3a0339a3f70..8c723d1c886 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -194,6 +194,9 @@ MSDOS_SUPPORT_REAL = ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ ## $MSDOS_SUPPORT_REAL if MSDOS. MSDOS_SUPPORT = +ns_appdir=@ns_appdir@/ +ns_appbindir=@ns_appbindir@/ +ns_appsrc=@ns_appsrc@ NS_OBJ=@NS_OBJ@ NS_SUPPORT=@NS_SUPPORT@ ## Next two only set if NS_IMPL_GNUSTEP. @@ -333,12 +336,6 @@ LD=ld #endif /* not ORDINARY_LINK */ -#ifdef HAVE_NS -ns_appdir=@ns_appdir@/ -ns_appbindir=@ns_appbindir@/ -ns_appsrc=@ns_appsrc@ -#endif /* HAVE_NS */ - /* lastfile must follow all files whose initialized data areas should be dumped as pure by dump-emacs. */ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ |