[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104202: Small Makefile.in fixes for
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104202: Small Makefile.in fixes for bug#8642. |
Date: |
Thu, 12 May 2011 00:24:14 -0700 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104202
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2011-05-12 00:24:14 -0700
message:
Small Makefile.in fixes for bug#8642.
* Makefile.in (src, install-arch-indep, bootstrap-clean, check-declare):
Shell portability fixes.
modified:
ChangeLog
Makefile.in
=== modified file 'ChangeLog'
--- a/ChangeLog 2011-05-10 13:57:12 +0000
+++ b/ChangeLog 2011-05-12 07:24:14 +0000
@@ -1,6 +1,11 @@
+2011-05-12 Glenn Morris <address@hidden>
+
+ * Makefile.in (src, install-arch-indep, bootstrap-clean)
+ (check-declare): Shell portability fixes. (Bug#8642)
+
2011-05-10 Jim Meyering <address@hidden>
- fix doubled-word typos
+ Fix doubled-word typos.
* admin/notes/exit-value: the the -> the
* doc/lispref/minibuf.texi: in in -> in
* doc/misc/ede.texi: or or -> or
=== modified file 'Makefile.in'
--- a/Makefile.in 2011-05-06 06:30:56 +0000
+++ b/Makefile.in 2011-05-12 07:24:14 +0000
@@ -373,7 +373,7 @@
LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"; \
fi;
if [ -r .bzr/checkout/dirstate ]; then \
- vcswitness="$$(pwd)/.bzr/checkout/dirstate"; \
+ vcswitness="`pwd`/.bzr/checkout/dirstate"; \
fi; \
cd $@; $(MAKE) all $(MFLAGS) \
CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
@@ -623,7 +623,7 @@
fi; \
cd ${srcdir}/info ; \
for elt in $(INFO_FILES); do \
- test "$(HAVE_MAKEINFO)" = "no" && ! test -e $$elt && continue; \
+ test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
chmod a+r $(DESTDIR)${infodir}/$$f; \
@@ -639,7 +639,7 @@
if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} &&
/bin/pwd)` ]; \
then \
for elt in $(INFO_FILES); do \
- test "$(HAVE_MAKEINFO)" = "no" && ! test -e $$elt && continue; \
+ test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
(cd $${thisdir}; \
${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir}
$(DESTDIR)${infodir}/$$elt); \
done; \
@@ -829,7 +829,7 @@
-(cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean)
(cd leim; $(MAKE) $(MFLAGS) maintainer-clean)
(cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
- [ ! -e config.log ] || mv -f config.log config.log~
+ [ ! -f config.log ] || mv -f config.log config.log~
${top_bootclean}
## configure; make bootstrap replaces the real config.log from configure
## with the truncated one from config.status. The former is more useful.
@@ -944,7 +944,7 @@
.PHONY: check-declare
check-declare:
- @if [ ! -e $(srcdir)/src/emacs ]; then \
+ @if [ ! -f $(srcdir)/src/emacs ]; then \
echo "You must build Emacs to use this command"; \
exit 1; \
fi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104202: Small Makefile.in fixes for bug#8642.,
Glenn Morris <=