diff options
| author | Wenzong Fan <wenzong.fan@windriver.com> | 2015-07-03 16:08:45 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-16 15:08:42 +0100 |
| commit | f374ed441627ac833aab62c1189a16ea26a4933b (patch) | |
| tree | af37f92d757f767c74ac9b3c2e016f9d43fe776d | |
| parent | 7c92e64834af8f578b5cfc3cfe33c13bb8a89754 (diff) | |
| download | openembedded-core-f374ed441627ac833aab62c1189a16ea26a4933b.tar.gz openembedded-core-f374ed441627ac833aab62c1189a16ea26a4933b.tar.bz2 openembedded-core-f374ed441627ac833aab62c1189a16ea26a4933b.zip | |
gettext-minimal-native: use MKIDR_P in Makefile.in.in
The Makefile.in.in provided by gettext-minimal-native will be copied
to many packages that need gettext to produce multi-lingual messages.
Replace mkdir_p with MKDIR_P to fix below errors from those packages'
install logs:
/bin/sh: 6: @mkdir_p@: not found
/usr/bin/install: cannot create regular file 'xxx'
As automake manual:
From Automake 1.8 to 1.9.6 AM_PROG_MKDIR_P used to define the output
variable mkdir_p to one of mkdir -p, install-sh -d, or mkinstalldirs.
Nowadays Autoconf provides a similar functionality with AC_PROG_MKDIR_P,
it will set output variable MKDIR_P.
Automake manual advises to switch ASAP to the more modern Autoconf-provided
interface instead; both the macro and the variable have been removed from
Automake 1.12.1 and later releases.
Signe-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.19.4/Makefile.in.in | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.4/Makefile.in.in b/meta/recipes-core/gettext/gettext-minimal-0.19.4/Makefile.in.in index 65184f65c7..8906ba0ff1 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.19.4/Makefile.in.in +++ b/meta/recipes-core/gettext/gettext-minimal-0.19.4/Makefile.in.in @@ -33,17 +33,7 @@ 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@ GMSGFMT_ = @GMSGFMT@ GMSGFMT_no = @GMSGFMT@ @@ -242,7 +232,7 @@ install: install-exec install-data install-exec: install-data: install-data-@USE_NLS@ if test "$(PACKAGE)" = "gettext-tools"; then \ - $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \ for file in $(DISTFILES.common) Makevars.template; do \ $(INSTALL_DATA) $(srcdir)/$$file \ $(DESTDIR)$(gettextsrcdir)/$$file; \ @@ -260,7 +250,7 @@ install-data-yes: all cat=`basename $$cat`; \ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ dir=$(localedir)/$$lang/LC_MESSAGES; \ - $(mkdir_p) $(DESTDIR)$$dir; \ + $(MKDIR_P) $(DESTDIR)$$dir; \ if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ @@ -300,7 +290,7 @@ installdirs: installdirs-exec installdirs-data installdirs-exec: installdirs-data: installdirs-data-@USE_NLS@ if test "$(PACKAGE)" = "gettext-tools"; then \ - $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \ else \ : ; \ fi @@ -311,7 +301,7 @@ installdirs-data-yes: cat=`basename $$cat`; \ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ dir=$(localedir)/$$lang/LC_MESSAGES; \ - $(mkdir_p) $(DESTDIR)$$dir; \ + $(MKDIR_P) $(DESTDIR)$$dir; \ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ if test -n "$$lc"; then \ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ |