[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108334: More small tweaks for Mak
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108334: More small tweaks for Makefile.in |
Date: |
Fri, 02 Nov 2012 02:35:15 -0000 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108334
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-05-21 21:10:05 -0400
message:
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.
modified:
ChangeLog
Makefile.in
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-21 20:40:55 +0000
+++ b/ChangeLog 2012-05-22 01:10:05 +0000
@@ -1,3 +1,9 @@
+2012-05-22 Glenn Morris <address@hidden>
+
+ * Makefile.in (blessmail, install-arch-dep, uninstall):
+ Check cd lib-src works.
+ (install-arch-dep, uninstall): Remove unneeded subshells.
+
2012-05-21 Glenn Morris <address@hidden>
* update-subdirs: Move to build-aux/.
=== modified file 'Makefile.in'
--- a/Makefile.in 2012-05-21 20:40:55 +0000
+++ b/Makefile.in 2012-05-22 01:10:05 +0000
@@ -340,7 +340,7 @@
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 @@
### 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 @@
###
### 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 \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r108334: More small tweaks for Makefile.in,
Glenn Morris <=