[glib] mkinstalldirs: Delete from version control

[Colin Walters <walters src gnome org>]

commit cff536c99ed22f83a09a1030c720f1555240390b
Author: Colin Walters <walters verbum org>
Date:   Sun Oct 28 09:46:35 2012 -0400

    mkinstalldirs: Delete from version control
    
    This is installed by automake.  By maintaining it in git, we create
    merge conflicts as people build with different versions of automake.
    
    Just use 'mkdir -p' instead in gettext.  Should be portable enough.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=686839

 Makefile.am       |    5 --
 mkinstalldirs     |  162 -----------------------------------------------------
 po/Makefile.in.in |   20 +-----
 3 files changed, 4 insertions(+), 183 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 55be9d2..5df81cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,6 @@ EXTRA_DIST += 			\
 	HACKING			\
 	autogen.sh		\
 	Makefile.decl		\
-	mkinstalldirs		\
 	makefile.msc		\
 	msvc_recommended_pragmas.h \
 	config.h.win32.in	\
@@ -98,10 +97,6 @@ endif
 
 $(pkgconfig_DATA): config.status
 
-# install mkinstalldirs for glib-gettextize's benefit
-gettextdir = $(datadir)/glib-2.0/gettext
-gettext_SCRIPTS = mkinstalldirs
-
 # build documentation when doing distcheck
 DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man --disable-maintainer-mode
 
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 53b496d..530910e 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -35,7 +35,7 @@ subdir = po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
+MKINSTALLDIRS = mkdir -p
 
 CC = @CC@
 GENCAT = @GENCAT@
@@ -130,11 +130,7 @@ install-exec:
 install-data: install-data- USE_NLS@
 install-data-no: all
 install-data-yes: all
-	if test -r "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
-	else \
-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
-	fi
+	$(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
@@ -144,11 +140,7 @@ install-data-yes: all
 	  esac; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $$dir; \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
-	  fi; \
+	  $(MKINSTALLDIRS) $$dir; \
 	  if test -r $$cat; then \
 	    $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
 	    echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
@@ -172,11 +164,7 @@ install-data-yes: all
 	  fi; \
 	done
 	if test "$(PACKAGE)" = "glib"; then \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-	  fi; \
+	  $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
 			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
 	else \