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

Tweak dependencies in top-level install rules

Browse Source 
* Makefile.in (install-arch-dep): Depend on install-arch-indep.
(install-arch-indep): Depend on install-leim.
(install): Remove explicit install-leim dependence.
This commit is contained in:
Glenn Morris 2012-05-18 00:00:09 -07:00
parent 62061397bf
commit ed0ba302d3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2012-05-18 Glenn Morris <rgm@gnu.org> 2012-05-18 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-arch-dep): Depend on install-arch-indep.
(install-arch-indep): Depend on install-leim.
(install): Remove explicit install-leim dependence.
* Makefile.in (install-arch-indep): * Makefile.in (install-arch-indep):
Move last element of mkdir rule here. Move last element of mkdir rule here.
(mkdir): Remove rule. (mkdir): Remove rule.

14
Makefile.in
View File

@ -446,9 +446,7 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
.PHONY: install .PHONY: install
### We do install-arch-indep first because install: all install-arch-indep install-arch-dep blessmail
### the executable needs the Lisp files and DOC file to work properly.
install: all install-arch-indep install-arch-dep install-leim blessmail
@true @true
## Ensure that $subdir contains a subdirs.el file. ## Ensure that $subdir contains a subdirs.el file.
@ -467,11 +465,9 @@ write_subdir=if [ -f $${subdir}/subdirs.el ]; \
fi fi
### 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 ### We do install-arch-indep first because the executable needs the
### to ensure that install-arch-indep finishes before this starts. ### Lisp files and DOC file to work properly.
### (TODO Why would it be nice? Why not just make this depend on install-arch-dep: install-arch-indep
### install-arch-indep then?)
install-arch-dep:
umask 022; ${MKDIR_P} $(DESTDIR)${bindir} umask 022; ${MKDIR_P} $(DESTDIR)${bindir}
(cd lib-src; \ (cd lib-src; \
$(MAKE) install $(MFLAGS) prefix=${prefix} \ $(MAKE) install $(MFLAGS) prefix=${prefix} \
@ -540,7 +536,7 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
## Is it really Emacs's job to create those directories? ## Is it really Emacs's job to create those directories?
## Should we also be ensuring they contain subdirs.el files? ## Should we also be ensuring they contain subdirs.el files?
## It would be easy to do, just use write_subdir. ## It would be easy to do, just use write_subdir.
install-arch-indep: info install-etc install-arch-indep: info install-etc install-leim
umask 022 ; \ umask 022 ; \
$(MKDIR_P) $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` $(MKDIR_P) $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
-set ${COPYDESTS} ; \ -set ${COPYDESTS} ; \