# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1216318455 0
# Node ID 163afe7c6871d1bef552aa8ee8c176e09e82a8f5
# Parent  2b46fd076f888d12e8098b40883253f670f8a1d8
files were missed on previous checkin

diff -r 2b46fd076f88 -r 163afe7c6871 ChangeLog
--- a/ChangeLog	Thu Jul 17 17:44:41 2008 +0000
+++ b/ChangeLog	Thu Jul 17 18:14:15 2008 +0000
@@ -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 -r 2b46fd076f88 -r 163afe7c6871 leim/ChangeLog
--- a/leim/ChangeLog	Thu Jul 17 17:44:41 2008 +0000
+++ b/leim/ChangeLog	Thu Jul 17 18:14:15 2008 +0000
@@ -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 -r 2b46fd076f88 -r 163afe7c6871 leim/Makefile.in
--- a/leim/Makefile.in	Thu Jul 17 17:44:41 2008 +0000
+++ b/leim/Makefile.in	Thu Jul 17 18:14:15 2008 +0000
@@ -33,6 +33,7 @@
 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 @@
 	  [ -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} \