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

More simplification for installation of site-lisp directories

Browse Source 
* Makefile.in (write_subdir): Create the directory if needed.
(install-arch-dep, mkdir): No need to make site-lisp directories.
This commit is contained in:
Glenn Morris 2012-05-17 14:47:52 -04:00
parent 53a84f3c9e
commit 4c54abe198
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2012-05-17 Glenn Morris <rgm@gnu.org> 2012-05-17 Glenn Morris <rgm@gnu.org>
* Makefile.in (write_subdir): Create the directory if needed.
(install-arch-dep, mkdir): No need to make site-lisp directories.
* Makefile.in (write_subdir): New. * Makefile.in (write_subdir): New.
(install-arch-indep, install-arch-dep): Use $write_subdir. (install-arch-indep, install-arch-dep): Use $write_subdir.

10
Makefile.in
View File

@ -460,11 +460,12 @@ install: all install-arch-indep install-arch-dep install-leim blessmail
write_subdir=if [ -f $${subdir}/subdirs.el ]; \ write_subdir=if [ -f $${subdir}/subdirs.el ]; \
then true; \ then true; \
else \ else \
umask 022; \
${MKDIR_P} $${subdir}; \
(echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
echo " (normal-top-level-add-subdirs-to-load-path))") \ echo " (normal-top-level-add-subdirs-to-load-path))") \
> $${subdir}/subdirs.el; \ > $${subdir}/subdirs.el; \
fi; \ fi
chmod a+r $${subdir}/subdirs.el
### Install the executables that were compiled specifically for this machine. ### Install the executables that were compiled specifically for this machine.
### It would be nice to do something for a parallel make ### It would be nice to do something for a parallel make
@ -484,7 +485,6 @@ install-arch-dep: mkdir
ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) || true ; \ ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) || true ; \
else \ else \
subdir=${ns_appresdir}/site-lisp; \ subdir=${ns_appresdir}/site-lisp; \
${MKDIR_P} $${subdir}; \
${write_subdir} || exit 1; \ ${write_subdir} || exit 1; \
rm -rf ${ns_appresdir}/share; \ rm -rf ${ns_appresdir}/share; \
fi fi
@ -659,7 +659,7 @@ install-leim: leim/Makefile mkdir
install-strip: install-strip:
$(MAKE) $(MFLAGS) INSTALL_STRIP=-s install $(MAKE) $(MFLAGS) INSTALL_STRIP=-s install
### Build all the directories we're going to install Emacs in. ### Build some of the directories we're going to install Emacs in.
### We set the umask so that any created directories are world-readable. ### We set the umask so that any created directories are world-readable.
### FIXME it would be good to warn about non-standard permissions of ### FIXME it would be good to warn about non-standard permissions of
### pre-existing directories, but that does not seem easy. ### pre-existing directories, but that does not seem easy.
@ -675,8 +675,6 @@ mkdir: FRC
$(MKDIR_P) $(DESTDIR)${datadir} ${COPYDESTS} \ $(MKDIR_P) $(DESTDIR)${datadir} ${COPYDESTS} \
$(DESTDIR)${infodir} $(DESTDIR)${man1dir} \ $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
$(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \ $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
$(DESTDIR)${datadir}/emacs/site-lisp \
$(DESTDIR)${datadir}/emacs/${version}/site-lisp \
$(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` \ $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` \
$(DESTDIR)${desktopdir} $${icondirs} $(DESTDIR)${desktopdir} $${icondirs}