aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorGlenn Morris2012-05-20 17:44:34 -0700
committerGlenn Morris2012-05-20 17:44:34 -0700
commitb847032c75e0cb4041a8736886e7054beb6f8696 (patch)
treebb6b972803658022ca3ac04629105f14c204a1b9 /lib-src
parent1b170bc63c2f3a3fbe6ba6996d5a015e82634909 (diff)
downloademacs-b847032c75e0cb4041a8736886e7054beb6f8696.tar.gz
emacs-b847032c75e0cb4041a8736886e7054beb6f8696.zip
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.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog5
-rw-r--r--lib-src/Makefile.in8
2 files changed, 9 insertions, 4 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index d0e9e5c525a..1b4cd548a99 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
12012-05-21 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (insrcdir, $(DESTDIR)${archlibdir}):
4 Scrap superfluous subshells.
5
12012-05-18 Glenn Morris <rgm@gnu.org> 62012-05-18 Glenn Morris <rgm@gnu.org>
2 7
3 * Makefile.in (install): Ensure $bindir exists. 8 * Makefile.in (install): Ensure $bindir exists.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index fd423212c9f..4e47e2e0bc6 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -190,7 +190,7 @@ $(EXE_FILES): ../lib/libgnu.a
190## These targets copy the scripts into the build directory so that 190## These targets copy the scripts into the build directory so that
191## they can be run from there in an uninstalled Emacs. 191## they can be run from there in an uninstalled Emacs.
192## Nothing to do if pwd = srcdir. 192## Nothing to do if pwd = srcdir.
193insrcdir=[ "`/bin/pwd`" = "`(cd $(srcdir) && /bin/pwd)`" ] 193insrcdir=[ "`/bin/pwd`" = "`cd $(srcdir) && /bin/pwd`" ]
194 194
195stamp-rcs2log: $(srcdir)/rcs2log 195stamp-rcs2log: $(srcdir)/rcs2log
196 $(insrcdir) || cp -p $(srcdir)/rcs2log rcs2log 196 $(insrcdir) || cp -p $(srcdir)/rcs2log rcs2log
@@ -237,7 +237,7 @@ $(DESTDIR)${archlibdir}: all
237 @echo 237 @echo
238 @echo "Installing utilities run internally by Emacs." 238 @echo "Installing utilities run internally by Emacs."
239 umask 022; ${MKDIR_P} $(DESTDIR)${archlibdir} 239 umask 022; ${MKDIR_P} $(DESTDIR)${archlibdir}
240 if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \ 240 if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` != `/bin/pwd` ]; then \
241 for file in ${UTILITIES}; do \ 241 for file in ${UTILITIES}; do \
242 $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \ 242 $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \
243 done ; \ 243 done ; \
@@ -249,8 +249,8 @@ $(DESTDIR)${archlibdir}: all
249 chown ${gameuser} $(DESTDIR)${gamedir}; \ 249 chown ${gameuser} $(DESTDIR)${gamedir}; \
250 chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \ 250 chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \
251 fi 251 fi
252 if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \ 252 if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` \
253 != `(cd ${srcdir} && /bin/pwd)` ]; then \ 253 != `cd ${srcdir} && /bin/pwd` ]; then \
254 for file in ${SCRIPTS}; do \ 254 for file in ${SCRIPTS}; do \
255 $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \ 255 $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
256 done ; \ 256 done ; \