diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-05-21 21:10:05 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-05-21 21:10:05 -0400 |
| commit | 39078e4aed2ee94d978329e16953b038c919f2e9 (patch) | |
| tree | 782dbd2d2d8dee8a030eeedb6a621b87ffb57419 | |
| parent | 32514cfe6881164095467840fa082b15cc378a7c (diff) | |
| download | emacs-39078e4aed2ee94d978329e16953b038c919f2e9.tar.gz | |
More small tweaks for Makefile.in
* Makefile.in (blessmail, install-arch-dep, uninstall):
Check cd lib-src works.
(install-arch-dep, uninstall): Remove unneeded subshells.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index f25e9c3681e..29b8b2385c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-05-22 Glenn Morris <rgm@gnu.org> + + * Makefile.in (blessmail, install-arch-dep, uninstall): + Check cd lib-src works. + (install-arch-dep, uninstall): Remove unneeded subshells. + 2012-05-21 Glenn Morris <rgm@gnu.org> * update-subdirs: Move to build-aux/. diff --git a/Makefile.in b/Makefile.in index 763a3644fcd..0043e1b197c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -340,7 +340,7 @@ src: Makefile FRC VCSWITNESS="$$vcswitness" blessmail: Makefile src FRC - cd lib-src; $(MAKE) maybe-blessmail $(MFLAGS) \ + cd lib-src && $(MAKE) maybe-blessmail $(MFLAGS) \ MAKE='${MAKE}' archlibdir='$(archlibdir)' # We used to have one rule per */Makefile.in, but that leads to race @@ -417,11 +417,11 @@ write_subdir=if [ -f $${subdir}/subdirs.el ]; \ ### Lisp files and DOC file to work properly. install-arch-dep: install-arch-indep install-doc umask 022; ${MKDIR_P} $(DESTDIR)${bindir} - (cd lib-src; \ + cd lib-src && \ $(MAKE) install $(MFLAGS) prefix=${prefix} \ exec_prefix=${exec_prefix} bindir=${bindir} \ libexecdir=${libexecdir} archlibdir=${archlibdir} \ - INSTALL_STRIP=${INSTALL_STRIP}) + INSTALL_STRIP=${INSTALL_STRIP} if test "${ns_self_contained}" = "no"; then \ ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \ chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) ; \ @@ -630,10 +630,10 @@ install-strip: ### ### Don't delete the lisp and etc directories if they're in the source tree. uninstall: - (cd lib-src; \ + cd lib-src && \ $(MAKE) $(MFLAGS) uninstall \ prefix=${prefix} exec_prefix=${exec_prefix} \ - bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir}) + bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir} -unset CDPATH; \ for dir in $(DESTDIR)${lispdir} $(DESTDIR)${etcdir} ; do \ if [ -d $${dir} ]; then \ |