aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.in3
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 131abbb6079..8634246bf41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
12010-05-16 Glenn Morris <rgm@gnu.org> 12010-05-16 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in (ns_appdir): Remove.
4 (install-arch-dep): Test $ns_appresdir instead of $ns_appdir.
5
3 * configure.in (TEMACS_LDFLAGS2): New output variable. 6 * configure.in (TEMACS_LDFLAGS2): New output variable.
4 7
5 * configure.in (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New output variable. 8 * 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@
164x_default_search_path=@x_default_search_path@ 164x_default_search_path=@x_default_search_path@
165 165
166# Location to install Emacs.app under NeXT/Open/GNUstep / Cocoa 166# Location to install Emacs.app under NeXT/Open/GNUstep / Cocoa
167ns_appdir=@ns_appdir@
168ns_appbindir=@ns_appbindir@ 167ns_appbindir=@ns_appbindir@
169ns_appresdir=@ns_appresdir@ 168ns_appresdir=@ns_appresdir@
170 169
@@ -418,7 +417,7 @@ install-arch-dep: mkdir
418 ${INSTALL_DATA} lib-src/$$f $(DESTDIR)${archlibdir}/$$f; \ 417 ${INSTALL_DATA} lib-src/$$f $(DESTDIR)${archlibdir}/$$f; \
419 else true; fi ; \ 418 else true; fi ; \
420 done 419 done
421 if test "${ns_appdir}" != ""; then \ 420 if test "${ns_appresdir}" != ""; then \
422 ( cd ${ns_appresdir} ; \ 421 ( cd ${ns_appresdir} ; \
423 if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ 422 if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
424 if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \ 423 if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \