aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorGlenn Morris2012-05-11 21:19:47 -0400
committerGlenn Morris2012-05-11 21:19:47 -0400
commit005ad204984f9cc908338e6ce273a5b6c7522183 (patch)
treea3bce5ad7862514412fac3dd59d7b8298b7d1e80 /lib-src
parent3fe7cdc86d67dd5dcf1ce9d779b20dfec9eafb8d (diff)
downloademacs-005ad204984f9cc908338e6ce273a5b6c7522183.tar.gz
emacs-005ad204984f9cc908338e6ce273a5b6c7522183.zip
Don't use build-aux/install-sh -d directly
* leim/Makefile.in (MKDIR_P): New, set by configure. (install): Use $MKDIR_P. * lib-src/Makefile.in (MKDIR_P): New, set by configure. ($(DESTDIR)${archlibdir}): Use $MKDIR_P.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog5
-rw-r--r--lib-src/Makefile.in5
2 files changed, 8 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index fe00c29cff7..aa78c25d1e1 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
12012-05-12 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (MKDIR_P): New, set by configure.
4 ($(DESTDIR)${archlibdir}): Use $MKDIR_P.
5
12012-05-10 Paul Eggert <eggert@cs.ucla.edu> 62012-05-10 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 etags: pacify gcc -Wstack-protector on Ubuntu 12.04 x86 8 etags: pacify gcc -Wstack-protector on Ubuntu 12.04 x86
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 6732030a648..be19b6dc15c 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -106,6 +106,7 @@ INSTALL_DATA = @INSTALL_DATA@
106INSTALL_SCRIPT = @INSTALL_SCRIPT@ 106INSTALL_SCRIPT = @INSTALL_SCRIPT@
107# By default, we uphold the dignity of our programs. 107# By default, we uphold the dignity of our programs.
108INSTALL_STRIP = 108INSTALL_STRIP =
109MKDIR_P = @MKDIR_P@
109 110
110# ========================== Lists of Files =========================== 111# ========================== Lists of Files ===========================
111 112
@@ -231,13 +232,13 @@ maybe-blessmail: $(BLESSMAIL_TARGET)
231$(DESTDIR)${archlibdir}: all 232$(DESTDIR)${archlibdir}: all
232 @echo 233 @echo
233 @echo "Installing utilities run internally by Emacs." 234 @echo "Installing utilities run internally by Emacs."
234 umask 022; $(top_srcdir)/build-aux/install-sh -d $(DESTDIR)${archlibdir} 235 umask 022; ${MKDIR_P} $(DESTDIR)${archlibdir}
235 if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \ 236 if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
236 for file in ${UTILITIES}; do \ 237 for file in ${UTILITIES}; do \
237 $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \ 238 $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \
238 done ; \ 239 done ; \
239 fi 240 fi
240 umask 022; $(top_srcdir)/build-aux/install-sh -d $(DESTDIR)${gamedir}; \ 241 umask 022; ${MKDIR_P} $(DESTDIR)${gamedir}; \
241 touch $(DESTDIR)${gamedir}/snake-scores; \ 242 touch $(DESTDIR)${gamedir}/snake-scores; \
242 touch $(DESTDIR)${gamedir}/tetris-scores 243 touch $(DESTDIR)${gamedir}/tetris-scores
243 -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score && chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \ 244 -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score && chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \