Mercurial > emacs
changeset 96770:163afe7c6871
files were missed on previous checkin
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Thu, 17 Jul 2008 18:14:15 +0000 |
| parents | 2b46fd076f88 |
| children | d92ec7333164 |
| files | ChangeLog leim/ChangeLog leim/Makefile.in |
| diffstat | 3 files changed, 22 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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
--- 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} \