Commit 177b0288 authored by Glenn Morris's avatar Glenn Morris
Browse files

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.
parent 50819706
2010-05-14 Glenn Morris <rgm@gnu.org> 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. * sed1v2.inp (MSDOS_OBJ): Edit to dosfns.o msdos.o.
(MSDOS_SUPPORT): Edit to $(MSDOS_SUPPORT_REAL). (MSDOS_SUPPORT): Edit to $(MSDOS_SUPPORT_REAL).
* sed1x.inp (MSDOS_X_OBJ): Edit to w16select.o termcap.o. * sed1x.inp (MSDOS_X_OBJ): Edit to w16select.o termcap.o.
......
...@@ -91,6 +91,9 @@ s/\.h\.in/.h-in/ ...@@ -91,6 +91,9 @@ s/\.h\.in/.h-in/
/^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@//
/^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o/ /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o/
/^MSDOS_SUPPORT *=/s/= */= $(MSDOS_SUPPORT_REAL)/ /^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_OBJ *=/s/@NS_OBJ@//
/^NS_SUPPORT *=/s/@NS_SUPPORT@// /^NS_SUPPORT *=/s/@NS_SUPPORT@//
/^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@//
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
   
2010-05-14 Glenn Morris <rgm@gnu.org> 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 (mktime, X11, register): Move undefs to configure.
   
* Makefile.in (MSDOS_OBJ): Default to empty, let msdos scripts set it. * Makefile.in (MSDOS_OBJ): Default to empty, let msdos scripts set it.
......
...@@ -194,6 +194,9 @@ MSDOS_SUPPORT_REAL = ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ ...@@ -194,6 +194,9 @@ MSDOS_SUPPORT_REAL = ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \
## $MSDOS_SUPPORT_REAL if MSDOS. ## $MSDOS_SUPPORT_REAL if MSDOS.
MSDOS_SUPPORT = MSDOS_SUPPORT =
ns_appdir=@ns_appdir@/
ns_appbindir=@ns_appbindir@/
ns_appsrc=@ns_appsrc@
NS_OBJ=@NS_OBJ@ NS_OBJ=@NS_OBJ@
NS_SUPPORT=@NS_SUPPORT@ NS_SUPPORT=@NS_SUPPORT@
## Next two only set if NS_IMPL_GNUSTEP. ## Next two only set if NS_IMPL_GNUSTEP.
...@@ -333,12 +336,6 @@ LD=ld ...@@ -333,12 +336,6 @@ LD=ld
#endif /* not ORDINARY_LINK */ #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 /* lastfile must follow all files whose initialized data areas should
be dumped as pure by dump-emacs. */ be dumped as pure by dump-emacs. */
obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment