[Emacs-diffs] /srv/bzr/emacs/trunk r100275: No harm in always defining some ns_ Makefile variables.

[Glenn Morris]

------------------------------------------------------------
revno: 100275
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-05-13 21:23:23 -0700
message:
  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.
modified:
  msdos/ChangeLog
  msdos/sed1v2.inp
  src/ChangeLog
  src/Makefile.in

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2010-05-14 03:13:39 +0000
+++ b/msdos/ChangeLog   2010-05-14 04:23:23 +0000
@@ -1,5 +1,7 @@
 2010-05-14  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2010-05-14 03:13:39 +0000
+++ b/msdos/sed1v2.inp  2010-05-14 04:23:23 +0000
@@ -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@//

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-14 03:52:21 +0000
+++ b/src/ChangeLog     2010-05-14 04:23:23 +0000
@@ -5,6 +5,8 @@
 
 2010-05-14  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-14 03:36:40 +0000
+++ b/src/Makefile.in   2010-05-14 04:23:23 +0000
@@ -194,6 +194,9 @@
 ## $MSDOS_SUPPORT_REAL if MSDOS.
 MSDOS_SUPPORT = 
 
address@hidden@/
address@hidden@/
address@hidden@
 address@hidden@
 address@hidden@
 ## Next two only set if NS_IMPL_GNUSTEP.
@@ -333,12 +336,6 @@
 
 #endif /* not ORDINARY_LINK */
 
-#ifdef HAVE_NS
address@hidden@/
address@hidden@/
address@hidden@
-#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 \