procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Command substitution already runs in a subshell

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2012-05-20 17:44:34 -07:00
parent 1b170bc63c
commit b847032c75
10 changed files with 39 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-05-21 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-arch-indep, install-doc, install-info)
(uninstall): Scrap superfluous subshells.
2012-05-19 Ulrich Mueller <ulm@gentoo.org>
* Makefile.in (install-etc): Respect DESTDIR. (Bug#11518)

10
Makefile.in
View file

@ -529,7 +529,7 @@ install-arch-indep: install-leim install-info install-man ${INSTALL_ARCH_INDEP_E
[ -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-arch-indep: install-leim install-info install-man ${INSTALL_ARCH_INDEP_E
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 @@ install-info: info
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 @@ uninstall:
-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 \

4
leim/ChangeLog
View file

@ -1,3 +1,7 @@
2012-05-21 Glenn Morris <rgm@gnu.org>
* Makefile.in (leim-list.el, install): Scrap superfluous subshells.
2012-05-12 Glenn Morris <rgm@gnu.org>
* Makefile.in (MKDIR_P): New, set by configure.

6
leim/Makefile.in
View file

@ -157,7 +157,7 @@ changed.misc: ${SUBDIRS} ${MISC_SOURCES}
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 @@ compile-main: ${TIT_MISC}
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 \

5
lib-src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-05-21 Glenn Morris <rgm@gnu.org>
* Makefile.in (insrcdir, $(DESTDIR)${archlibdir}):
Scrap superfluous subshells.
2012-05-18 Glenn Morris <rgm@gnu.org>
* Makefile.in (install): Ensure $bindir exists.

8
lib-src/Makefile.in
View file

@ -190,7 +190,7 @@ $(EXE_FILES): ../lib/libgnu.a
## 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 @@ $(DESTDIR)${archlibdir}: all
@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 @@ $(DESTDIR)${archlibdir}: all
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 ; \

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-05-21 Glenn Morris <rgm@gnu.org>
* Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
Scrap superfluous subshells.
2012-05-19 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/bytecomp.el (byte-compile-root-dir): New var.

6
lisp/Makefile.in
View file

@ -106,7 +106,7 @@ COMPILE_FIRST = \
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 @@ setwins=subdirs=`(find . -type d -print)`; \
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 @@ setwins_almost=subdirs=`(find . -type d -print)`; \
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" ;; \

4
test/ChangeLog
View file

@ -1,3 +1,7 @@
2012-05-21 Glenn Morris <rgm@gnu.org>
* automated/Makefile.in (setwins): Scrap superfluous subshell.
2012-05-15 Teodor Zlatanov <tzz@lifelogs.com>
* automated/url-util-tests.el: New file to test

2
test/automated/Makefile.in
View file

@ -48,7 +48,7 @@ BYTE_COMPILE_EXTRA_FLAGS =
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" ;; \