From: Bruno Haible <bruno@clisp.org>
Date: Mon, 10 Mar 2003 16:10:07 +0000 (+0000)
Subject: Simplify MKINSTALLDIRS.
X-Git-Tag: v0.12~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dabf40884759aa2bc7de410121925bff0e64340;p=thirdparty%2Fgettext.git

Simplify MKINSTALLDIRS.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index ae8decfd4..49ed8a0be 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-28  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.in (mkinstalldirs): Simplify. Prepending "$(top_builddir)/"
+	in the case of a relative $srcdir is now handled in gettext.m4.
+
 2003-02-28  Bruno Haible  <bruno@clisp.org>
 
 	* localcharset.h: Change copyright to LGPL. Enclose declaration in
diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index 9ee4361a1..b6b048548 100644
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -39,7 +39,7 @@ subdir = intl
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
 
 l = @INTL_LIBTOOL_SUFFIX_PREFIX@
 
diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 42d6e4be8..65c6ba92e 100644
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-28  Bruno Haible  <bruno@clisp.org>
+
+	* gettext.m4 (AM_MKINSTALLDIRS): Fix MKINSTALLDIRS for when AC_AUX_DIR
+	is given and $srcdir is a relative directory.
+
 2003-02-16  Bruno Haible  <bruno@clisp.org>
 
 	* gettext.m4 (AM_PO_SUBDIRS): Require an xgettext that supports the
diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4
index 6fd1fa099..6b1f6aa32 100644
--- a/gettext-runtime/m4/gettext.m4
+++ b/gettext-runtime/m4/gettext.m4
@@ -1,4 +1,4 @@
-# gettext.m4 serial 18 (gettext-0.12)
+# gettext.m4 serial 19 (gettext-0.12)
 dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -597,10 +597,13 @@ AC_DEFUN([AM_MKINSTALLDIRS],
 [
   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
   dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
-  dnl Try to locate is.
+  dnl Try to locate it.
   MKINSTALLDIRS=
   if test -n "$ac_aux_dir"; then
-    MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+    case "$ac_aux_dir" in
+      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
+      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
+    esac
   fi
   if test -z "$MKINSTALLDIRS"; then
     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index cea2a51a9..169018120 100644
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-28  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.in.in (mkinstalldirs): Simplify. Prepending
+	"$(top_builddir)/" in the case of a relative $srcdir is now handled
+	in gettext.m4.
+
 2003-02-24  Bruno Haible  <bruno@clisp.org>
 
 	* de.po: Update from Karl Eichwalder <ke@suse.de>.
diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
index fa15e7f84..cfe7e01e9 100644
--- a/gettext-runtime/po/Makefile.in.in
+++ b/gettext-runtime/po/Makefile.in.in
@@ -27,7 +27,7 @@ gettextsrcdir = $(datadir)/gettext/po
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
 
 GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@
diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index 21360f47c..759aa2981 100644
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-28  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.in.in (mkinstalldirs): Simplify. Prepending
+	"$(top_builddir)/" in the case of a relative $srcdir is now handled
+	in gettext.m4.
+
 2003-02-24  Bruno Haible  <bruno@clisp.org>
 
 	* ca.po: Update from Ivan Vilata i Balaguer <ivan@selidor.net>.
diff --git a/gettext-tools/po/Makefile.in.in b/gettext-tools/po/Makefile.in.in
index fa15e7f84..cfe7e01e9 100644
--- a/gettext-tools/po/Makefile.in.in
+++ b/gettext-tools/po/Makefile.in.in
@@ -27,7 +27,7 @@ gettextsrcdir = $(datadir)/gettext/po
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
 
 GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@