# HG changeset patch
# User Kenichi Handa <handa@etlken>
# Date 1273822146 -32400
# Node ID be6f5247ebb4f7b9cb2b991813c8030e5cef69d2
# Parent  23f4cd23ea89930cd974ae76224624e26b713e80# Parent  3088b1e224071c9d0d5b1508d4082132278d2689
merge trunk

diff -r 23f4cd23ea89 -r be6f5247ebb4 msdos/ChangeLog
--- 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.
diff -r 23f4cd23ea89 -r be6f5247ebb4 msdos/sed1v2.inp
--- 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@//
diff -r 23f4cd23ea89 -r be6f5247ebb4 src/ChangeLog
--- 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.
diff -r 23f4cd23ea89 -r be6f5247ebb4 src/Makefile.in
--- 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 \