summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-03-22 20:09:55 -0700
committerGlenn Morris <rgm@gnu.org>2011-03-22 20:09:55 -0700
commit8cc1d5193337bef03f9525f2c017f6e70c4e64b9 (patch)
tree1ada81caa2a4d322a9ffdf3007ffbb4d0c080935 /lib-src
parent8ae17ff2bf7443379745356de33826b306dfefdf (diff)
downloademacs-8cc1d5193337bef03f9525f2c017f6e70c4e64b9.tar.gz
Replace mkinstalldirs with `install-sh -d', as automake recommends.
* Makefile.in (mkdir): Use `install-sh -d' instead of mkinstalldirs. (sync-from-gnulib): Don't sync mkinstalldirs. * make-dist: Don't distribute mkinstalldirs. * leim/Makefile.in (install): Use `install-sh -d' rather than mkinstalldirs. * lib-src/Makefile.in ($(DESTDIR)${archlibdir}): Use `install-sh -d' rather than mkinstalldirs. * configure.in, doc/emacs/Makefile.in: Update comments. * admin/notes/copyright: Remove mkinstalldirs.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog5
-rw-r--r--lib-src/Makefile.in4
2 files changed, 7 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 3df2f6881db..0e46a83aafa 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-23 Glenn Morris <rgm@gnu.org>
+
+ * Makefile.in ($(DESTDIR)${archlibdir}):
+ Use `install-sh -d' rather than mkinstalldirs.
+
2011-03-23 Paul Eggert <eggert@cs.ucla.edu>
* ebrowse.c: Use size_t, not int, for sizes.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index f671b0844ce..36366a4d2e7 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -235,13 +235,13 @@ maybe-blessmail: $(BLESSMAIL_TARGET)
$(DESTDIR)${archlibdir}: all
@echo
@echo "Installing utilities run internally by Emacs."
- umask 022; $(top_srcdir)/mkinstalldirs $(DESTDIR)${archlibdir}
+ umask 022; $(top_srcdir)/install-sh -d $(DESTDIR)${archlibdir}
if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
for file in ${UTILITIES}; do \
$(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \
done ; \
fi
- umask 022; $(top_srcdir)/mkinstalldirs $(DESTDIR)${gamedir}; \
+ umask 022; $(top_srcdir)/install-sh -d $(DESTDIR)${gamedir}; \
touch $(DESTDIR)${gamedir}/snake-scores; \
touch $(DESTDIR)${gamedir}/tetris-scores
-if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score && chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \