From: Glenn Morris <rgm@gnu.org>
Date: Sun, 16 May 2010 23:21:06 +0000 (-0700)
Subject: Remove one variable from Makefile.in.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~208^2~23
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=58dfab186f74e60211e0b58a117d8d7fa3309db8;p=emacs.git

Remove one variable from Makefile.in.

* Makefile.in (ns_appdir): Remove.
(install-arch-dep): Test $ns_appresdir instead of $ns_appdir.
---

diff --git a/ChangeLog b/ChangeLog
index 131abbb6079..8634246bf41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-05-16  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (ns_appdir): Remove.
+	(install-arch-dep): Test $ns_appresdir instead of $ns_appdir.
+
 	* configure.in (TEMACS_LDFLAGS2): New output variable.
 
 	* configure.in (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New output variable.
diff --git a/Makefile.in b/Makefile.in
index d21a9e56976..798b128fb44 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -164,7 +164,6 @@ VPATH=@srcdir@
 x_default_search_path=@x_default_search_path@
 
 # Location to install Emacs.app under NeXT/Open/GNUstep / Cocoa
-ns_appdir=@ns_appdir@
 ns_appbindir=@ns_appbindir@
 ns_appresdir=@ns_appresdir@
 
@@ -418,7 +417,7 @@ install-arch-dep: mkdir
 	    ${INSTALL_DATA} lib-src/$$f $(DESTDIR)${archlibdir}/$$f; \
 	  else true; fi ; \
 	done
-	if test "${ns_appdir}" != ""; then \
+	if test "${ns_appresdir}" != ""; then \
 	  ( cd ${ns_appresdir} ; \
 	    if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
 	    if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \