From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Thu, 17 Jul 2008 18:14:15 +0000 (+0000)
Subject: files were missed on previous checkin
X-Git-Tag: emacs-pretest-23.0.90~4106
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/2a7973b62722e292302d6c03200771d33cb890bf

files were missed on previous checkin
---

diff --git a/ChangeLog b/ChangeLog
index 5644ff7c81..4ffb098fb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-07-17  Adrian Robert <Adrian.B.Robert@gmail.com>
+
+	* configure.in: Print out some info to user for NeXTstep builds.
+	(ns-app): Remove enable option.
+	(ns-self-contained): Add enable option.
+	(ns_appbindir, ns_appresdir, ns_appsrc): Set them based on Cocoa or
+	GNUstep, use to set install prefixes, and substitute in Makefiles.
+	* configure: Regenerate.
+	* Makefile.in (install-arch-dep): Perform post-install cleanup inside
+	NS app bundle.
+
 2008-07-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* configure.in: Extract and substitute GNUSTEP_MAKEFILES.
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 225e91f0df..303c34036b 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-17  Adrian Robert <Adrian.B.Robert@gmail.com>
+
+	* Makefile.in (install): Perform post-install cleanup inside NS app
+	bundle.
+
 2008-07-12  Juri Linkov  <juri@jurta.org>
 
 	* quail/rfc1345.el: Replace non-printable control characters with
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 122156e513..731f0d5531 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -33,6 +33,7 @@ prefix=@prefix@
 datarootdir=@datarootdir@
 datadir=@datadir@
 srcdir=@srcdir@
+ns_appresdir=@ns_appresdir@
 
 # Where to install LEIM files.
 INSTALLDIR=$(DESTDIR)${datadir}/emacs/${version}/leim
@@ -259,6 +260,11 @@ install: all
 	  [ -n "$${installuser}" ] && break ; \
 	done ; \
 	find ${INSTALLDIR} -exec chown $${installuser} '{}' ';'
+	if [ "${ns_appresdir}" != "" ]; then \
+	  ( cd ${ns_appresdir} ; \
+	    if test -d share/emacs ; then mv -f share/emacs/*/* . ; fi ; \
+	    rm -fr share ) ; \
+	else true ; fi
 
 clean mostlyclean:
 	rm -f ${TIT-MISC} ${TIT-MISC:.elc=.el} \