merge trunk

2 files changed, 5 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 51a63c046c7..5d47f437d4a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/Makefile.in b/src/Makefile.in
index 3a0339a3f70..8c723d1c886 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 \