@mkdir_p@ may also refer to $(install_sh).

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index cf81144e490fec605a1fea4de8edc5cabec0b4a9..6e1b38d547621be7c9a7f76abb18cb42c14f44c0 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-10  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.in (install_sh): New variable.
+       Fixes "make install" errors in packages that have no 'mkinstalldirs'
+       file and use automake <= 1.9.x, on platforms where 'mkdir' does not
+       support the -p option.
+
+       * Makefile.in (mkinstalldirs): Prefix with $(SHELL).
+
 2006-08-29  Bruno Haible  <bruno@clisp.org>
 
        * localcharset.c: Include configmake.h in order to get LIBDIR defined.

diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index f08afae4ca85f06e27159409ada6626a7ef948cc..b094d0aa473efd6b2046a36c2b0e156408d87e38 100644 (file)
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -51,7 +51,16 @@ subdir = intl
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-mkinstalldirs = @install_sh@ -d
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
 MKDIR_P = @MKDIR_P@
 mkdir_p = @mkdir_p@
 

diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index e01988a9abfa72111e3d2d40a9b74fdfe06ace7d..37607a016bc764bfc36bcb6e8b5b3e79b19e4173 100644 (file)
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-10  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.in.in (install_sh): New variable.
+       Fixes "make install" errors in packages that have no 'mkinstalldirs'
+       file and use automake <= 1.9.x, on platforms where 'mkdir' does not
+       support the -p option.
+
 2006-08-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * Makefile.in.in (MKDIR_P): New variable. Needed by $(mkdir_p) with

diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
index 1fe689aa05b08f306ef957ac2c8ddb0056bd0519..f031e94f90b51303fde47b6e3d7716813c4329f7 100644 (file)
--- a/gettext-runtime/po/Makefile.in.in
+++ b/gettext-runtime/po/Makefile.in.in
@@ -30,7 +30,16 @@ gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
 mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
 MKDIR_P = @MKDIR_P@
 mkdir_p = @mkdir_p@
 

diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index f67e3bdbfd3bfaa2510bb41b9030b097ca3b4019..7fed523288b63c596c9c48fb618d971ba7bdb2b4 100644 (file)
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-10  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.in.in (install_sh): New variable.
+       Fixes "make install" errors in packages that have no 'mkinstalldirs'
+       file and use automake <= 1.9.x, on platforms where 'mkdir' does not
+       support the -p option.
+
 2006-08-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * Makefile.in.in (MKDIR_P): New variable. Needed by $(mkdir_p) with

diff --git a/gettext-tools/po/Makefile.in.in b/gettext-tools/po/Makefile.in.in
index 1fe689aa05b08f306ef957ac2c8ddb0056bd0519..f031e94f90b51303fde47b6e3d7716813c4329f7 100644 (file)
--- a/gettext-tools/po/Makefile.in.in
+++ b/gettext-tools/po/Makefile.in.in
@@ -30,7 +30,16 @@ gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
 mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
 MKDIR_P = @MKDIR_P@
 mkdir_p = @mkdir_p@