blob: 82ab1d2bbe112175864651851f81409406633a51 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
The Makefile used by shared-mime-info is one big race with the SUBDIRS
option and the dependency specifically calling make all combining to
create multiple make instances all of which may try and build targets
like update-mime-database.
This patch removes those options meaning make can correctly identify
dependencies and stop itself racing itself.
RP 10/10/2011
Upstream-Status: Pending
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Index: shared-mime-info-1.0/Makefile.am
===================================================================
--- shared-mime-info-1.0.orig/Makefile.am
+++ shared-mime-info-1.0/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS=. po
-
INCLUDES = $(ALL_CFLAGS)
packagesdir = $(datadir)/mime/packages
@@ -72,8 +70,7 @@ uninstall-hook:
all: check create-pot
-create-pot:
- $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot
+create-pot: po
check: create-pot freedesktop.org.xml update-mime-database check-translations
if test -e $(top_builddir)/freedesktop.org.xml; then \
|
