summaryrefslogtreecommitdiff
path: root/Makefile.in
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 /Makefile.in
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 'Makefile.in')
-rw-r--r--Makefile.in5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index 4dd8cff1bbc..c94d7a5445a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -347,7 +347,6 @@ sync-from-gnulib: $(gnulib_srcdir)
$(gnulib_srcdir)/build-aux/config.sub \
$(gnulib_srcdir)/build-aux/config.guess \
$(gnulib_srcdir)/build-aux/install-sh \
- $(gnulib_srcdir)/build-aux/mkinstalldirs \
$(gnulib_srcdir)/build-aux/move-if-change \
$(srcdir)
cd $(srcdir) && autoreconf -I m4
@@ -678,7 +677,7 @@ install-strip:
### Build all the directories we're going to install Emacs in. Since
### we may be creating several layers of directories (for example,
-### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs
+### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use install-sh -d
### instead of mkdir. Not all systems' mkdir programs have the `-p' flag.
### We set the umask so that any created directories are world-readable.
### FIXME it would be good to warn about non-standard permissions of
@@ -692,7 +691,7 @@ mkdir: FRC
done ; \
icondirs=`echo "$${icondirs}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},g'` ; \
umask 022 ; \
- $(srcdir)/mkinstalldirs $(DESTDIR)${datadir} ${COPYDESTS} \
+ $(srcdir)/install-sh -d $(DESTDIR)${datadir} ${COPYDESTS} \
$(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
$(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
$(DESTDIR)${datadir}/emacs/site-lisp \