From: Bruno Haible <bruno@clisp.org>
Date: Fri, 28 Jul 2000 16:42:49 +0000 (+0000)
Subject: Fix the MKINSTALLDIRS problem (which autoconf does not adjust automatically).
X-Git-Tag: v0.10.36~254
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9a34144fe3ccefca6df9afee6d55b64bab81bff;p=thirdparty%2Fgettext.git

Fix the MKINSTALLDIRS problem (which autoconf does not adjust automatically).
---

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 3af3c1473..149039b15 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-28  Bruno Haible  <haible@clisp.cons.org>
+
+	* Makefile.in (mkinstalldirs): New macro. Needed when configured with
+	--srcdir=<relative pathname>; then ac_aux_dir will be a relative
+	pathname rooted at the top builddir, and @MKINSTALLDIRS@ likewise.
+	(install-exec, install-data): Use it.
+
 2000-07-26  Bruno Haible  <haible@clisp.cons.org>
 
 	* Makefile.in (install-exec, install-data): Use $(SHELL) for calling
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 623cce3a9..5550b7d12 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -40,6 +40,7 @@ subdir = intl
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
+mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
 
 l = @l@
 
@@ -134,15 +135,14 @@ install: install-exec install-data
 install-exec: all
 	if test "$(PACKAGE)" = "gettext" \
 	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-	  $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(libdir); \
-	  $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(includedir); \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
 	  $(INSTALL_DATA) intlh.inst $(DESTDIR)$(includedir)/libintl.h; \
 	  $(INSTALL_DATA) libintl.a $(DESTDIR)$(libdir)/libintl.a; \
 	else \
 	  : ; \
 	fi; \
 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(libdir); \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
 	  test -f $(DESTDIR)$(libdir)/charset.alias \
 	    && orig=$(DESTDIR)$(libdir)/charset.alias \
 	    || orig=charset.alias; \
@@ -156,7 +156,7 @@ install-exec: all
 	fi
 install-data: all
 	if test "$(PACKAGE)" = "gettext"; then \
-	  $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
+	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
 	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
 	  dists="$(DISTFILES.common)"; \
 	  for file in $$dists; do \
diff --git a/po/ChangeLog b/po/ChangeLog
index b45ccbe4d..c2e69bbe1 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-28  Bruno Haible  <haible@clisp.cons.org>
+
+	* Makefile.in.in (top_builddir, mkinstalldirs): New macros. Needed
+	when configured with --srcdir=<relative pathname>; then ac_aux_dir
+	will be a relative pathname rooted at the top builddir, and
+	@MKINSTALLDIRS@ likewise.
+	(install-data-yes): Use it.
+
 2000-07-26  Bruno Haible  <haible@clisp.cons.org>
 
 	* Makefile.in.in (MKINSTALLDIRS): Remove the  $(top_srcdir)/ prefix.
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index f5eb38fa0..2ba0f24d4 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -14,6 +14,7 @@ SHELL = /bin/sh
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
+top_builddir = ..
 VPATH = @srcdir@
 
 prefix = @prefix@
@@ -27,6 +28,7 @@ subdir = po
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
+mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
 
 CC = @CC@
 GENCAT = @GENCAT@
@@ -110,7 +112,7 @@ install-exec:
 install-data: install-data-@USE_NLS@
 install-data-no: all
 install-data-yes: all
-	$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+	$(mkinstalldirs) $(DESTDIR)$(datadir); \
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
@@ -120,7 +122,7 @@ install-data-yes: all
 	  esac; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  dir=$$destdir/$$lang/LC_MESSAGES; \
-	  $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$$dir; \
+	  $(mkinstalldirs) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then \
 	    $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
 	    echo "installing $$cat as" \
@@ -146,7 +148,7 @@ install-data-yes: all
 	  fi; \
 	done
 	if test "$(PACKAGE)" = "gettext"; then \
-	  $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
+	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
 			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
 	else \