Mercurial > emacs
changeset 108563:be6f5247ebb4
merge trunk
| author | Kenichi Handa <handa@etlken> |
|---|---|
| date | Fri, 14 May 2010 16:29:06 +0900 |
| parents | 23f4cd23ea89 (current diff) 3088b1e22407 (diff) |
| children | dea8b4d40a70 50557bcb79ad |
| files | src/ChangeLog |
| diffstat | 4 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/msdos/ChangeLog Fri May 14 13:15:58 2010 +0900 +++ b/msdos/ChangeLog Fri May 14 16:29:06 2010 +0900 @@ -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.
--- a/msdos/sed1v2.inp Fri May 14 13:15:58 2010 +0900 +++ b/msdos/sed1v2.inp Fri May 14 16:29:06 2010 +0900 @@ -91,6 +91,9 @@ /^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@//
--- a/src/ChangeLog Fri May 14 13:15:58 2010 +0900 +++ b/src/ChangeLog Fri May 14 16:29:06 2010 +0900 @@ -24,6 +24,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.
--- a/src/Makefile.in Fri May 14 13:15:58 2010 +0900 +++ b/src/Makefile.in Fri May 14 16:29:06 2010 +0900 @@ -194,6 +194,9 @@ ## $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 @@ #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 \