diff options
author | Constantin Musca <constantinx.musca@intel.com> | 2012-12-21 13:58:39 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-31 09:43:23 +0000 |
commit | 9fc0588ad4a71d11e88ec1bd44bef2d5f672e1c9 (patch) | |
tree | 9a748602ecca2e0d296204dac0932d52b0bffdf7 /meta/recipes-support/shared-mime-info/shared-mime-info | |
parent | 645ccbb0b76a28456375689e1ac3de0734720894 (diff) | |
download | poky-9fc0588ad4a71d11e88ec1bd44bef2d5f672e1c9.tar.gz |
shared-mime-info: upgrade to 1.0
parallelmake.patch: adapt to the new version
(From OE-Core rev: 07b0425a937cc36874909a47daa4def92d0bfe82)
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/shared-mime-info/shared-mime-info')
-rw-r--r-- | meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch index 8b6f9e524e..82ab1d2bbe 100644 --- a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch +++ b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch | |||
@@ -9,23 +9,24 @@ dependencies and stop itself racing itself. | |||
9 | RP 10/10/2011 | 9 | RP 10/10/2011 |
10 | 10 | ||
11 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
12 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | ||
12 | 13 | ||
13 | Index: shared-mime-info-0.91/Makefile.am | 14 | Index: shared-mime-info-1.0/Makefile.am |
14 | =================================================================== | 15 | =================================================================== |
15 | --- shared-mime-info-0.91.orig/Makefile.am 2011-10-10 21:47:19.834173921 +0100 | 16 | --- shared-mime-info-1.0.orig/Makefile.am |
16 | +++ shared-mime-info-0.91/Makefile.am 2011-10-10 21:45:57.000000000 +0100 | 17 | +++ shared-mime-info-1.0/Makefile.am |
17 | @@ -1,5 +1,3 @@ | 18 | @@ -1,5 +1,3 @@ |
18 | -SUBDIRS=. po | 19 | -SUBDIRS=. po |
19 | - | 20 | - |
20 | INCLUDES = $(ALL_CFLAGS) | 21 | INCLUDES = $(ALL_CFLAGS) |
21 | 22 | ||
22 | packagesdir = $(datadir)/mime/packages | 23 | packagesdir = $(datadir)/mime/packages |
23 | @@ -70,8 +68,7 @@ | 24 | @@ -72,8 +70,7 @@ uninstall-hook: |
24 | 25 | ||
25 | all: check create-pot | 26 | all: check create-pot |
26 | 27 | ||
27 | -create-pot: | 28 | -create-pot: |
28 | - $(MAKE) -C po shared-mime-info.pot | 29 | - $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot |
29 | +create-pot: po | 30 | +create-pot: po |
30 | 31 | ||
31 | check: create-pot freedesktop.org.xml update-mime-database check-translations | 32 | check: create-pot freedesktop.org.xml update-mime-database check-translations |