From 2a7973b62722e292302d6c03200771d33cb890bf Mon Sep 17 00:00:00 2001 From: Adrian Robert Date: Thu, 17 Jul 2008 18:14:15 +0000 Subject: files were missed on previous checkin --- leim/ChangeLog | 5 +++++ leim/Makefile.in | 6 ++++++ 2 files changed, 11 insertions(+) (limited to 'leim') diff --git a/leim/ChangeLog b/leim/ChangeLog index 225e91f0df7..303c34036b5 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,8 @@ +2008-07-17 Adrian Robert + + * Makefile.in (install): Perform post-install cleanup inside NS app + bundle. + 2008-07-12 Juri Linkov * quail/rfc1345.el: Replace non-printable control characters with diff --git a/leim/Makefile.in b/leim/Makefile.in index 122156e5137..731f0d55312 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} \ -- cgit v1.2.1