mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

Further simplify install-arch-dep for self-contained NS builds

Browse Source 
* Makefile.in (install-arch-dep): Use $write_subdir.
This commit is contained in:
Glenn Morris 2012-05-17 14:28:24 -04:00
parent 9f1ea7dcd9
commit 05f3d308da
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,7 +1,7 @@
2012-05-17 Glenn Morris <rgm@gnu.org>
* 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.

17
Makefile.in
View File

@ -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} \