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

---
 examples/libtracker-extract/01-mockup.rule    |  4 ++++
 examples/libtracker-extract/01-mockup.rule.in |  4 ----
 examples/libtracker-extract/Makefile.am       | 14 +++++---------
 3 files changed, 9 insertions(+), 13 deletions(-)
 create mode 100644 examples/libtracker-extract/01-mockup.rule
 delete mode 100644 examples/libtracker-extract/01-mockup.rule.in

(limited to 'examples')

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)
-- 
cgit v1.2.1