From 8b516e633d0af3e492b47887aa57253c35e3c0af Mon Sep 17 00:00:00 2001
From: Nicola Fontana <ntd@entidi.it>
Date: Sat, 24 Mar 2012 08:49:12 +0100
Subject: [PATCH] build: corrected MKINSTALLDIRS in
 po-properties/Makefile.in.in

The MKINSTALLDIRS var above suffers from serious expansion problems:
$ac_aux_dir, part of MKINSTALLDIRS when AC_CONFIG_AUX_DIR() is used,
is embedded in its expanded form. This means is useless because can be
either an absolute path or a path relative to $(top_srcdir).

To avoid tinkering with this path, the proper hardcoded version
"$(top_srcdir)/build/mkinstalldirs" will be used instead.
---
 po-properties/Makefile.in.in | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/po-properties/Makefile.in.in b/po-properties/Makefile.in.in
index b9cdf9a7..138507db 100644
--- a/po-properties/Makefile.in.in
+++ b/po-properties/Makefile.in.in
@@ -34,10 +34,10 @@ localedir = $(libdir)/locale
 gnulocaledir = $(datadir)/locale
 gettextsrcdir = $(datadir)/glib-2.0/gettext/po
 subdir = po-properties
+mkinstalldirs = $(SHELL) $(top_srcdir)/build/mkinstalldirs
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
 
 CC = @CC@
 GENCAT = @GENCAT@
@@ -107,12 +107,8 @@ 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
-	@catalogs='$(CATALOGS)'; \
+	@$(mkinstalldirs) $(DESTDIR)$(datadir); \
+	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  case "$$cat" in \
@@ -121,11 +117,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)"; \
@@ -149,11 +141,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 \
-- 
2.11.4.GIT