From 7a583997a0fe8355f75cd1fa0995866ec6e18dec Mon Sep 17 00:00:00 2001
From: Martyn Russell <martyn@lanedo.com>
Date: Mon, 24 Feb 2014 15:51:18 +0000
Subject: libtracker-extract: Don't break compilation due to missing
 rules/modules dir

---
 configure.ac                                  |  8 ++++++++
 examples/libtracker-extract/01-mockup.rule    |  4 ++++
 examples/libtracker-extract/01-mockup.rule.in |  4 ----
 examples/libtracker-extract/Makefile.am       | 14 +++++---------
 src/libtracker-extract/Makefile.am            |  4 ++--
 src/tracker-extract/Makefile.am               | 12 +++++++++---
 6 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 examples/libtracker-extract/01-mockup.rule
 delete mode 100644 examples/libtracker-extract/01-mockup.rule.in

diff --git a/configure.ac b/configure.ac
index 79458ea16..15e5e3394 100644
--- a/configure.ac
+++ b/configure.ac
@@ -320,6 +320,14 @@ TRACKER_EXTRACT_REQUIRED="glib-2.0        >= $GLIB_REQUIRED
 
 PKG_CHECK_MODULES(TRACKER_EXTRACT, [$TRACKER_EXTRACT_REQUIRED])
 
+TRACKER_EXTRACT_MODULES_DIR="${libdir}/tracker-${TRACKER_API_VERSION}/extract-modules"
+AC_SUBST(TRACKER_EXTRACT_MODULES_DIR)
+
+# NOTE: We don't use ${TRACKER_API_VERSION} because other content like
+# the ontology is installed to the same location.
+TRACKER_EXTRACT_RULES_DIR="${datadir}/tracker/extract-rules"
+AC_SUBST(TRACKER_EXTRACT_RULES_DIR)
+
 # Check requirements for tracker-extract modules
 TRACKER_EXTRACT_MODULES_REQUIRED="glib-2.0     >= $GLIB_REQUIRED"
 
diff --git a/examples/libtracker-extract/01-mockup.rule b/examples/libtracker-extract/01-mockup.rule
new file mode 100644
index 000000000..31d56b561
--- /dev/null
+++ b/examples/libtracker-extract/01-mockup.rule
@@ -0,0 +1,4 @@
+[ExtractorRule]
+ModulePath=@modulesdir@/libextract-mp3.so
+MimeTypes=audio/mpeg;audio/x-mp3;
+
diff --git a/examples/libtracker-extract/01-mockup.rule.in b/examples/libtracker-extract/01-mockup.rule.in
deleted file mode 100644
index 31d56b561..000000000
--- a/examples/libtracker-extract/01-mockup.rule.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[ExtractorRule]
-ModulePath=@modulesdir@/libextract-mp3.so
-MimeTypes=audio/mpeg;audio/x-mp3;
-
diff --git a/examples/libtracker-extract/Makefile.am b/examples/libtracker-extract/Makefile.am
index cc2e80f64..a632727ae 100644
--- a/examples/libtracker-extract/Makefile.am
+++ b/examples/libtracker-extract/Makefile.am
@@ -16,17 +16,13 @@ libextract_mockup_la_LIBADD =                          \
 	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_EXTRACT_LIBS)
 
-rules_in_files = 01-mockup.rule.in
-
-%.rule: %.rule.in
-	@sed -e "s|@extractmodulesdir[@]|${extractmodulesdir}|" $< > $@
-
 # This is noinst_ only because it's an example, normally this would be
 # "rules" (for rules_DATA and rulesdir) or whatever name you want to
 # give for your rules files.
-noinstdir = $(extractrulesdir)
+#
+# _RULES_DIR = $(datadir)/tracker/extract-rules
+#
+noinstdir = $(TRACKER_EXTRACT_RULES_DIR)
 noinst_DATA = 01-mockup.rule
 
-CLEANFILES = $(noinst_DATA)
-
-EXTRA_DIST = $(rules_in_files)
+EXTRA_DIST = $(noinst_DATA)
diff --git a/src/libtracker-extract/Makefile.am b/src/libtracker-extract/Makefile.am
index ad201356d..abae22343 100644
--- a/src/libtracker-extract/Makefile.am
+++ b/src/libtracker-extract/Makefile.am
@@ -5,8 +5,8 @@ AM_CPPFLAGS =                                          \
 	-I$(top_srcdir)/src                            \
 	-I$(top_builddir)/src                          \
 	-DSHAREDIR=\""$(datadir)"\"                    \
-	-DTRACKER_EXTRACTOR_RULES_DIR=\""$(extractrulesdir)"\" \
-	-DTRACKER_EXTRACTORS_DIR=\""$(extractmodulesdir)"\" \
+	-DTRACKER_EXTRACTOR_RULES_DIR=\""$(TRACKER_EXTRACT_RULES_DIR)"\" \
+	-DTRACKER_EXTRACTORS_DIR=\""$(TRACKER_EXTRACT_MODULES_DIR)"\" \
 	$(LIBTRACKER_EXTRACT_CFLAGS)
 
 libtracker_extractdir = $(libdir)/tracker-$(TRACKER_API_VERSION)
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 45c25f417..69a638e01 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -1,14 +1,16 @@
-include $(top_srcdir)/Makefile.extractdirs
+#
+# _RULES_DIR = $(datadir)/tracker/extract-rules
+#
+rulesdir = $(TRACKER_EXTRACT_RULES_DIR)
 
 module_flags = -module -avoid-version -no-undefined
-rulesdir = $(extractrulesdir)
 
 AM_CPPFLAGS = \
 	$(BUILD_CFLAGS) \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/src \
 	-DLOCALEDIR=\""$(localedir)"\" \
-	-DTRACKER_EXTRACTORS_DIR=\""$(extractmodulesdir)"\" \
+	-DTRACKER_EXTRACTORS_DIR=\""$(TRACKER_EXTRACT_MODULES_DIR)"\" \
 	$(TRACKER_EXTRACT_CFLAGS)
 
 # NOTE: The rules are here and not in another sub-directory because we
@@ -54,6 +56,10 @@ rules_files = \
 # NOTE:
 # We don't always link with libtracker-common, we only link
 # against it if we directly use functions in the .so
+#
+# _MODULES_DIR = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules
+#
+extractmodulesdir = $(TRACKER_EXTRACT_MODULES_DIR)
 extractmodules_LTLIBRARIES = # Empty
 rules_DATA = # Empty
 
-- 
cgit v1.2.1