[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108319: Command substitution already
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108319: Command substitution already runs in a subshell |
Date: |
Sun, 20 May 2012 17:44:34 -0700 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 108319
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2012-05-20 17:44:34 -0700
message:
Command substitution already runs in a subshell
* Makefile.in (install-arch-indep, install-doc, install-info, uninstall):
* leim/Makefile.in (leim-list.el, install):
* lib-src/Makefile.in (insrcdir, $(DESTDIR)${archlibdir}):
* lisp/Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
* test/automated/Makefile.in (setwins):
Scrap superfluous subshells.
modified:
ChangeLog
Makefile.in
leim/ChangeLog
leim/Makefile.in
lib-src/ChangeLog
lib-src/Makefile.in
lisp/ChangeLog
lisp/Makefile.in
test/ChangeLog
test/automated/Makefile.in
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-19 18:57:10 +0000
+++ b/ChangeLog 2012-05-21 00:44:34 +0000
@@ -1,3 +1,8 @@
+2012-05-21 Glenn Morris <address@hidden>
+
+ * Makefile.in (install-arch-indep, install-doc, install-info)
+ (uninstall): Scrap superfluous subshells.
+
2012-05-19 Ulrich Mueller <address@hidden>
* Makefile.in (install-etc): Respect DESTDIR. (Bug#11518)
=== modified file 'Makefile.in'
--- a/Makefile.in 2012-05-19 19:17:04 +0000
+++ b/Makefile.in 2012-05-21 00:44:34 +0000
@@ -529,7 +529,7 @@
[ -d $${dir} ] || exit 1 ; \
dest=$$1 ; shift ; \
[ -d $${dest} ] && \
- [ `(cd $${dest} && /bin/pwd)` = `(cd $${dir} && /bin/pwd)` ] && \
+ [ `cd $${dest} && /bin/pwd` = `cd $${dir} && /bin/pwd` ] && \
continue ; \
rm -rf $${dest} ; \
umask 022; ${MKDIR_P} $${dest} ; \
@@ -578,7 +578,7 @@
install-doc: install-arch-indep
-unset CDPATH; \
umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \
- if [ `(cd ./etc; /bin/pwd)` != `(cd $(DESTDIR)${docdir}; /bin/pwd)` ]; \
+ if [ `cd ./etc; /bin/pwd` != `cd $(DESTDIR)${docdir}; /bin/pwd` ]; \
then \
fullversion=`./src/emacs --version | sed -n '1 s/GNU Emacs *//p'`; \
if [ -f "./etc/DOC-$${fullversion}" ]; \
@@ -597,7 +597,7 @@
umask 022; ${MKDIR_P} $(DESTDIR)${infodir}
-unset CDPATH; \
thisdir=`/bin/pwd`; \
- [ `(cd ${srcdir}/info && /bin/pwd)` = `(cd $(DESTDIR)${infodir} &&
/bin/pwd)` ] || \
+ [ `cd ${srcdir}/info && /bin/pwd` = `cd $(DESTDIR)${infodir} &&
/bin/pwd` ] || \
(cd $(DESTDIR)${infodir}; \
[ -f dir ] || \
(cd $${thisdir}; \
@@ -670,8 +670,8 @@
-unset CDPATH; \
for dir in $(DESTDIR)${lispdir} $(DESTDIR)${etcdir} ; do \
if [ -d $${dir} ]; then \
- case `(cd $${dir} ; /bin/pwd)` in \
- `(cd ${srcdir} ; /bin/pwd)`* ) ;; \
+ case `cd $${dir} ; /bin/pwd` in \
+ `cd ${srcdir} ; /bin/pwd`* ) ;; \
* ) rm -rf $${dir} ;; \
esac ; \
case $${dir} in \
=== modified file 'leim/ChangeLog'
--- a/leim/ChangeLog 2012-05-12 01:19:47 +0000
+++ b/leim/ChangeLog 2012-05-21 00:44:34 +0000
@@ -1,3 +1,7 @@
+2012-05-21 Glenn Morris <address@hidden>
+
+ * Makefile.in (leim-list.el, install): Scrap superfluous subshells.
+
2012-05-12 Glenn Morris <address@hidden>
* Makefile.in (MKDIR_P): New, set by configure.
=== modified file 'leim/Makefile.in'
--- a/leim/Makefile.in 2012-05-19 19:04:50 +0000
+++ b/leim/Makefile.in 2012-05-21 00:44:34 +0000
@@ -157,7 +157,7 @@
leim-list.el: ${SUBDIRS} ${TIT_MISC} ${srcdir}/leim-ext.el
rm -f leim-list.el
- if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \
+ if [ x`cd ${srcdir} && /bin/pwd` = x`/bin/pwd` ] ; then \
${RUN_EMACS} -l ${buildlisppath}/international/quail \
--eval "(update-leim-list-file \".\")" ; \
else \
@@ -191,11 +191,11 @@
install: all
umask 022; ${MKDIR_P} ${LEIM_INSTALLDIR}
- if [ x`(cd ${LEIM_INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \
+ if [ x`cd ${LEIM_INSTALLDIR} && /bin/pwd` != x`/bin/pwd` ] ; then \
rm -f ${LEIM_INSTALLDIR}/leim-list.el; \
rm -rf ${LEIM_INSTALLDIR}/quail ${LEIM_INSTALLDIR}/ja-dic ; \
echo "Copying leim files to ${LEIM_INSTALLDIR} ..." ; \
- if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \
+ if [ x`cd ${srcdir} && /bin/pwd` = x`/bin/pwd` ] ; then \
tar -chf - leim-list.el quail ja-dic \
| (cd ${LEIM_INSTALLDIR}; umask 0; tar -xvf - && cat >
/dev/null) ;\
else \
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-05-18 06:33:04 +0000
+++ b/lib-src/ChangeLog 2012-05-21 00:44:34 +0000
@@ -1,3 +1,8 @@
+2012-05-21 Glenn Morris <address@hidden>
+
+ * Makefile.in (insrcdir, $(DESTDIR)${archlibdir}):
+ Scrap superfluous subshells.
+
2012-05-18 Glenn Morris <address@hidden>
* Makefile.in (install): Ensure $bindir exists.
=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in 2012-05-18 06:33:04 +0000
+++ b/lib-src/Makefile.in 2012-05-21 00:44:34 +0000
@@ -190,7 +190,7 @@
## These targets copy the scripts into the build directory so that
## they can be run from there in an uninstalled Emacs.
## Nothing to do if pwd = srcdir.
-insrcdir=[ "`/bin/pwd`" = "`(cd $(srcdir) && /bin/pwd)`" ]
+insrcdir=[ "`/bin/pwd`" = "`cd $(srcdir) && /bin/pwd`" ]
stamp-rcs2log: $(srcdir)/rcs2log
$(insrcdir) || cp -p $(srcdir)/rcs2log rcs2log
@@ -237,7 +237,7 @@
@echo
@echo "Installing utilities run internally by Emacs."
umask 022; ${MKDIR_P} $(DESTDIR)${archlibdir}
- if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
+ if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` != `/bin/pwd` ]; then \
for file in ${UTILITIES}; do \
$(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file
$(DESTDIR)${archlibdir}/$$file ; \
done ; \
@@ -249,8 +249,8 @@
chown ${gameuser} $(DESTDIR)${gamedir}; \
chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \
fi
- if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
- != `(cd ${srcdir} && /bin/pwd)` ]; then \
+ if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` \
+ != `cd ${srcdir} && /bin/pwd` ]; then \
for file in ${SCRIPTS}; do \
$(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
done ; \
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-05-19 18:28:32 +0000
+++ b/lisp/ChangeLog 2012-05-21 00:44:34 +0000
@@ -1,3 +1,8 @@
+2012-05-21 Glenn Morris <address@hidden>
+
+ * Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
+ Scrap superfluous subshells.
+
2012-05-19 Stefan Monnier <address@hidden>
* emacs-lisp/bytecomp.el (byte-compile-root-dir): New var.
=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in 2012-01-19 07:21:25 +0000
+++ b/lisp/Makefile.in 2012-05-21 00:44:34 +0000
@@ -106,7 +106,7 @@
emacs = EMACSLOADPATH=$(lisp) LC_ALL=C $(EMACS) $(EMACSOPT)
# Common command to find subdirectories
-setwins=subdirs=`(find . -type d -print)`; \
+setwins=subdirs=`find . -type d -print`; \
for file in $$subdirs; do \
case $$file in */.* | */.*/* | */=* ) ;; \
*) wins="$$wins $$file" ;; \
@@ -114,7 +114,7 @@
done
# Find all subdirectories except `obsolete' and `term'.
-setwins_almost=subdirs=`(find . -type d -print)`; \
+setwins_almost=subdirs=`find . -type d -print`; \
for file in $$subdirs; do \
case $$file in */.* | */.*/* | */=* | */obsolete | */term ) ;; \
*) wins="$$wins $$file" ;; \
@@ -122,7 +122,7 @@
done
# Find all subdirectories in which we might want to create subdirs.el
-setwins_for_subdirs=subdirs=`(find . -type d -print)`; \
+setwins_for_subdirs=subdirs=`find . -type d -print`; \
for file in $$subdirs; do \
case $$file in */.* | */.*/* | */=* | */cedet* ) ;; \
*) wins="$$wins $$file" ;; \
=== modified file 'test/ChangeLog'
--- a/test/ChangeLog 2012-05-15 08:52:15 +0000
+++ b/test/ChangeLog 2012-05-21 00:44:34 +0000
@@ -1,3 +1,7 @@
+2012-05-21 Glenn Morris <address@hidden>
+
+ * automated/Makefile.in (setwins): Scrap superfluous subshell.
+
2012-05-15 Teodor Zlatanov <address@hidden>
* automated/url-util-tests.el: New file to test
=== modified file 'test/automated/Makefile.in'
--- a/test/automated/Makefile.in 2012-01-05 09:46:05 +0000
+++ b/test/automated/Makefile.in 2012-05-21 00:44:34 +0000
@@ -48,7 +48,7 @@
emacs = EMACSLOADPATH=$(lispsrc):$(test) LC_ALL=C $(EMACS) $(EMACSOPT)
# Common command to find subdirectories
-setwins=subdirs=`(find . -type d -print)`; \
+setwins=subdirs=`find . -type d -print`; \
for file in $$subdirs; do \
case $$file in */.* | */.*/* | */=* ) ;; \
*) wins="$$wins $$file" ;; \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108319: Command substitution already runs in a subshell,
Glenn Morris <=