From ffe93d6dc707aaf92529cefb38a1814956b48c9e Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Tue, 20 Mar 2012 22:51:04 +0100 Subject: [PATCH] Replaced mkinstalldirs with `mkdir -p'. --- Makefile.in | 2 +- etc/Makefile.in | 2 +- man/Makefile.in | 8 ++++---- mkinstalldirs | 32 -------------------------------- uip/Makefile.in | 4 ++-- 5 files changed, 8 insertions(+), 40 deletions(-) delete mode 100755 mkinstalldirs diff --git a/Makefile.in b/Makefile.in index efab885..2f63dad 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,7 +62,7 @@ INSTALL_DATA = @INSTALL_DATA@ # all files in this directory included in the distribution DIST = ChangeLog COPYRIGHT DATE INSTALL MACHINES README VERSION \ - ChangeLog install-sh mkinstalldirs Makefile.in aclocal.m4 \ + ChangeLog install-sh Makefile.in aclocal.m4 \ acconfig.h config.h.in configure.ac configure stamp-h.in \ config.sub config.guess diff --git a/etc/Makefile.in b/etc/Makefile.in index 10111e7..dabafd6 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -64,7 +64,7 @@ mhn.defaults: $(srcdir)/mhn.defaults.sh $(MHNSEARCHPROG) install: install-etc-files install-etc-files: - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir) + mkdir -p $(DESTDIR)$(etcdir) INSTALL_FILES="$(GENERATED_ETC_FILES)"; \ for file in $(STATIC_FILES); do \ INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \ diff --git a/man/Makefile.in b/man/Makefile.in index 4d4dec9..4ad5db8 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -118,28 +118,28 @@ install: install-man1 install-man5 install-man7 install-man8 # install the man pages in man1 install-man1: - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext1) + mkdir -p $(DESTDIR)$(mandir)/man$(manext1) for file in $(MAN1); do \ $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext1) ; \ done # install the man pages in man5 install-man5: - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext5) + mkdir -p $(DESTDIR)$(mandir)/man$(manext5) for file in $(MAN5); do \ $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext5) ; \ done # install the man pages in man7 install-man7: - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext7) + mkdir -p $(DESTDIR)$(mandir)/man$(manext7) for file in $(MAN7); do \ $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext7) ; \ done # install the man pages in man8 install-man8: - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext8) + mkdir -p $(DESTDIR)$(mandir)/man$(manext8) for file in $(MAN8); do \ $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext8) ; \ done diff --git a/mkinstalldirs b/mkinstalldirs deleted file mode 100755 index 0801ec2..0000000 --- a/mkinstalldirs +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman -# Created: 1993-05-16 -# Last modified: 1994-03-25 -# Public domain - -errstatus=0 - -for file in ${1+"$@"} ; do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d in ${1+"$@"} ; do - pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" 1>&2 - mkdir "$pathcomp" || errstatus=$? - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# mkinstalldirs ends here diff --git a/uip/Makefile.in b/uip/Makefile.in index 02bc94e..67a7862 100644 --- a/uip/Makefile.in +++ b/uip/Makefile.in @@ -237,7 +237,7 @@ install: install-cmds install-misc install-lcmds install-scmds # install commands install-cmds: - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) + mkdir -p $(DESTDIR)$(bindir) for cmd in $(CMDS); do \ $(INSTALL_PROGRAM) $$cmd $(DESTDIR)$(bindir)/$$cmd; \ done @@ -261,7 +261,7 @@ install-lcmds: # install misc support binaries install-misc: - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) + mkdir -p $(DESTDIR)$(libdir) for misc in $(MISC); do \ $(INSTALL_PROGRAM) $$misc $(DESTDIR)$(libdir)/$$misc; \ done -- 1.7.10.4