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:09:19 +0100 |
commit | ca869fdb5cbf16ec0dd775664dcd906beb024d30 (patch) | |
tree | 2ff0a5ee07f5c8e38a3cc1fa063281f7759f04ca /meta/recipes-core/gettext | |
parent | 2b811ee96012bd251502d2f3adac85de56350f9d (diff) | |
download | poky-ca869fdb5cbf16ec0dd775664dcd906beb024d30.tar.gz |
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>
(From OE-Core rev: f374ed441627ac833aab62c1189a16ea26a4933b)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/gettext')
-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 | |||
33 | INSTALL = @INSTALL@ | 33 | INSTALL = @INSTALL@ |
34 | INSTALL_DATA = @INSTALL_DATA@ | 34 | INSTALL_DATA = @INSTALL_DATA@ |
35 | 35 | ||
36 | # We use $(mkdir_p). | ||
37 | # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as | ||
38 | # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, | ||
39 | # @install_sh@ does not start with $(SHELL), so we add it. | ||
40 | # In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined | ||
41 | # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake | ||
42 | # versions, $(mkinstalldirs) and $(install_sh) are unused. | ||
43 | mkinstalldirs = $(SHELL) @install_sh@ -d | ||
44 | install_sh = $(SHELL) @install_sh@ | ||
45 | MKDIR_P = @MKDIR_P@ | 36 | MKDIR_P = @MKDIR_P@ |
46 | mkdir_p = @mkdir_p@ | ||
47 | 37 | ||
48 | GMSGFMT_ = @GMSGFMT@ | 38 | GMSGFMT_ = @GMSGFMT@ |
49 | GMSGFMT_no = @GMSGFMT@ | 39 | GMSGFMT_no = @GMSGFMT@ |
@@ -242,7 +232,7 @@ install: install-exec install-data | |||
242 | install-exec: | 232 | install-exec: |
243 | install-data: install-data-@USE_NLS@ | 233 | install-data: install-data-@USE_NLS@ |
244 | if test "$(PACKAGE)" = "gettext-tools"; then \ | 234 | if test "$(PACKAGE)" = "gettext-tools"; then \ |
245 | $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ | 235 | $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \ |
246 | for file in $(DISTFILES.common) Makevars.template; do \ | 236 | for file in $(DISTFILES.common) Makevars.template; do \ |
247 | $(INSTALL_DATA) $(srcdir)/$$file \ | 237 | $(INSTALL_DATA) $(srcdir)/$$file \ |
248 | $(DESTDIR)$(gettextsrcdir)/$$file; \ | 238 | $(DESTDIR)$(gettextsrcdir)/$$file; \ |
@@ -260,7 +250,7 @@ install-data-yes: all | |||
260 | cat=`basename $$cat`; \ | 250 | cat=`basename $$cat`; \ |
261 | lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ | 251 | lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ |
262 | dir=$(localedir)/$$lang/LC_MESSAGES; \ | 252 | dir=$(localedir)/$$lang/LC_MESSAGES; \ |
263 | $(mkdir_p) $(DESTDIR)$$dir; \ | 253 | $(MKDIR_P) $(DESTDIR)$$dir; \ |
264 | if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ | 254 | if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ |
265 | $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ | 255 | $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ |
266 | echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ | 256 | echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ |
@@ -300,7 +290,7 @@ installdirs: installdirs-exec installdirs-data | |||
300 | installdirs-exec: | 290 | installdirs-exec: |
301 | installdirs-data: installdirs-data-@USE_NLS@ | 291 | installdirs-data: installdirs-data-@USE_NLS@ |
302 | if test "$(PACKAGE)" = "gettext-tools"; then \ | 292 | if test "$(PACKAGE)" = "gettext-tools"; then \ |
303 | $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ | 293 | $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \ |
304 | else \ | 294 | else \ |
305 | : ; \ | 295 | : ; \ |
306 | fi | 296 | fi |
@@ -311,7 +301,7 @@ installdirs-data-yes: | |||
311 | cat=`basename $$cat`; \ | 301 | cat=`basename $$cat`; \ |
312 | lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ | 302 | lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ |
313 | dir=$(localedir)/$$lang/LC_MESSAGES; \ | 303 | dir=$(localedir)/$$lang/LC_MESSAGES; \ |
314 | $(mkdir_p) $(DESTDIR)$$dir; \ | 304 | $(MKDIR_P) $(DESTDIR)$$dir; \ |
315 | for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ | 305 | for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ |
316 | if test -n "$$lc"; then \ | 306 | if test -n "$$lc"; then \ |
317 | if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ | 307 | if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ |