From c35de4365ac8f7a87b62b85a35eb122f79cb12ad Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 11 Sep 2006 12:40:51 +0000 Subject: [PATCH] @mkdir_p@ may also refer to $(install_sh). --- gettext-runtime/intl/ChangeLog | 9 +++++++++ gettext-runtime/intl/Makefile.in | 11 ++++++++++- gettext-runtime/po/ChangeLog | 7 +++++++ gettext-runtime/po/Makefile.in.in | 9 +++++++++ gettext-tools/po/ChangeLog | 7 +++++++ gettext-tools/po/Makefile.in.in | 9 +++++++++ 6 files changed, 51 insertions(+), 1 deletion(-) diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index cf81144e4..6e1b38d54 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,12 @@ +2006-09-10 Bruno Haible + + * 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 * 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 f08afae4c..b094d0aa4 100644 --- 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 e01988a9a..37607a016 100644 --- a/gettext-runtime/po/ChangeLog +++ b/gettext-runtime/po/ChangeLog @@ -1,3 +1,10 @@ +2006-09-10 Bruno Haible + + * 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 * 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 1fe689aa0..f031e94f9 100644 --- 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 f67e3bdbf..7fed52328 100644 --- a/gettext-tools/po/ChangeLog +++ b/gettext-tools/po/ChangeLog @@ -1,3 +1,10 @@ +2006-09-10 Bruno Haible + + * 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 * 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 1fe689aa0..f031e94f9 100644 --- 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@ -- 2.47.3