diff options
| author | Kenichi Handa <handa@etlken> | 2010-05-14 16:29:06 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@etlken> | 2010-05-14 16:29:06 +0900 |
| commit | c2eb4a8321dd86f085724c709e881663c81d0c6b (patch) | |
| tree | 1307a8cecc11966020dd53e230551e932e89a272 /src | |
| parent | ccd3ce49e08b4f0c0e1bcbb34e9055ca4002e21c (diff) | |
| parent | 177b028808f53afbb49328faeb683c2dd55a1794 (diff) | |
merge trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 51a63c046c..5d47f437d4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -24,6 +24,8 @@ 2010-05-14 Glenn Morris <[email protected]> + * 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 3a0339a3f7..8c723d1c88 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 \ |