From 05f3d308da1b93a1fffbb6653c84da02334ff0b8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 17 May 2012 14:28:24 -0400 Subject: [PATCH] Further simplify install-arch-dep for self-contained NS builds * Makefile.in (install-arch-dep): Use $write_subdir. --- ChangeLog | 2 +- Makefile.in | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e5d69dc68f..d218ac4197f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ 2012-05-17 Glenn Morris * Makefile.in (write_subdir): New. - (install-arch-indep): Use $write_subdir. + (install-arch-indep, install-arch-dep): Use $write_subdir. * configure.in (docdir, etcdir, infodir, lispdir): For a self-contained ns build, set these to the appropriate values. diff --git a/Makefile.in b/Makefile.in index 630ca2ff3ac..0f5ec8a0c7c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -473,15 +473,18 @@ install-arch-dep: mkdir rm -f $(DESTDIR)${bindir}/$(EMACS) ; \ ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) || true ; \ else \ - ( cd ${ns_appresdir} || exit 1 ; \ - if test -d share/emacs ; then \ - for dir in share/emacs/${version}/*; do \ - rm -fr `basename "$$dir"`; mv "$$dir" . ; \ - done ; \ - fi ; \ - rm -fr share ) ; \ + subdir=${ns_appresdir}/site-lisp; \ + ${MKDIR_P} $${subdir}; \ + ${write_subdir} || exit 1; \ + rm -rf ${ns_appresdir}/share; \ fi +## In the share directory, we are deleting: +## applications (with emacs.desktop) +## emacs (basically empty) +## icons (duplicates etc/images/icons/hicolor) +## man (maybe we should be installing this one, like info) + ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html ## Needs to be the user running install, so configure can't set it. set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \ -- 2.39.2