[tracker] miners: LN_S was getting target/name mixed up for miner service files



commit e67eb6ad047d1bb2b63231145b71d3f07f6f7cf7
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Dec 10 15:49:57 2014 +0000

    miners: LN_S was getting target/name mixed up for miner service files

 src/miners/apps/Makefile.am        |    7 ++++---
 src/miners/fs/Makefile.am          |    7 ++++---
 src/miners/rss/Makefile.am         |    7 ++++---
 src/miners/user-guides/Makefile.am |    7 ++++---
 src/plugins/evolution/Makefile.am  |    7 ++++---
 src/tracker-extract/Makefile.am    |    7 ++++---
 6 files changed, 24 insertions(+), 18 deletions(-)
---
diff --git a/src/miners/apps/Makefile.am b/src/miners/apps/Makefile.am
index 9bff30d..1dbf2a1 100644
--- a/src/miners/apps/Makefile.am
+++ b/src/miners/apps/Makefile.am
@@ -33,11 +33,12 @@ INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard
 
 install-data-hook:
        $(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
-       $(LN_S) -f "$(datadir)/tracker/miners/$(service_DATA)" \
-                  "$(DESTDIR)$(servicedir)/$(service_DATA)"
+       $(LN_S) -f "$(servicedir)/$(service_DATA)" \
+                   "$(datadir)/tracker/miners/$(service_DATA)"
 
 uninstall-local:
-       $(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)"
+       $(RM) "$(datadir)/tracker/miners/$(service_DATA)" && \
+       $(RM) "$(servicedir)/$(service_DATA)"
 
 # Desktop files: First we fix the VERSION and libexecdir
 %.desktop.in: %.desktop.in.in
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index df10d95..adf28c5 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -67,11 +67,12 @@ INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard
 
 install-data-hook:
        $(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
-       $(LN_S) -f "$(datadir)/tracker/miners/$(service_DATA)" \
-                  "$(DESTDIR)$(servicedir)/$(service_DATA)"
+       $(LN_S) -f "$(servicedir)/$(service_DATA)" \
+                   "$(datadir)/tracker/miners/$(service_DATA)"
 
 uninstall-local:
-       $(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)"
+       $(RM) "$(datadir)/tracker/miners/$(service_DATA)" && \
+       $(RM) "$(servicedir)/$(service_DATA)"
 
 # Desktop files: First we fix the VERSION and libexecdir
 if HAVE_LIBMEDIAART
diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am
index 369fca2..6652f82 100644
--- a/src/miners/rss/Makefile.am
+++ b/src/miners/rss/Makefile.am
@@ -33,11 +33,12 @@ INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard
 
 install-data-hook:
        $(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
-       $(LN_S) -f "$(datadir)/tracker/miners/$(service_DATA)" \
-                  "$(DESTDIR)$(servicedir)/$(service_DATA)"
+       $(LN_S) -f "$(servicedir)/$(service_DATA)" \
+                   "$(datadir)/tracker/miners/$(service_DATA)"
 
 uninstall-local:
-       $(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)"
+       $(RM) "$(datadir)/tracker/miners/$(service_DATA)" && \
+       $(RM) "$(servicedir)/$(service_DATA)"
 
 # Desktop files: First we fix the VERSION and libexecdir
 %.desktop.in: %.desktop.in.in
diff --git a/src/miners/user-guides/Makefile.am b/src/miners/user-guides/Makefile.am
index 4b82562..418a6b6 100644
--- a/src/miners/user-guides/Makefile.am
+++ b/src/miners/user-guides/Makefile.am
@@ -33,11 +33,12 @@ INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard
 
 install-data-hook:
        $(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
-       $(LN_S) -f "$(datadir)/tracker/miners/$(service_DATA)" \
-                  "$(DESTDIR)$(servicedir)/$(service_DATA)"
+       $(LN_S) -f "$(servicedir)/$(service_DATA)" \
+                   "$(datadir)/tracker/miners/$(service_DATA)"
 
 uninstall-local:
-       $(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)"
+       $(RM) "$(datadir)/tracker/miners/$(service_DATA)" && \
+       $(RM) "$(servicedir)/$(service_DATA)"
 
 # Desktop files: First we fix the VERSION and libexecdir
 %.desktop.in: %.desktop.in.in
diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am
index 4e46e24..c94d233 100644
--- a/src/plugins/evolution/Makefile.am
+++ b/src/plugins/evolution/Makefile.am
@@ -55,11 +55,12 @@ INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard
 
 install-data-hook:
        $(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
-       $(LN_S) -f "$(datadir)/tracker/miners/$(service_DATA)" \
-                  "$(DESTDIR)$(servicedir)/$(service_DATA)"
+       $(LN_S) -f "$(servicedir)/$(service_DATA)" \
+                   "$(datadir)/tracker/miners/$(service_DATA)"
 
 uninstall-local:
-       $(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)"
+       $(RM) "$(datadir)/tracker/miners/$(service_DATA)" && \
+       $(RM) "$(servicedir)/$(service_DATA)"
 
 # Dist / Clean rules for all data
 CLEANFILES += \
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 005241c..4448bf7 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -587,11 +587,12 @@ INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard
 
 install-data-hook:
        $(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
-       $(LN_S) -f "$(datadir)/tracker/miners/$(service_DATA)" \
-                  "$(DESTDIR)$(servicedir)/$(service_DATA)"
+       $(LN_S) -f "$(servicedir)/$(service_DATA)" \
+                   "$(datadir)/tracker/miners/$(service_DATA)"
 
 uninstall-local:
-       $(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)"
+       $(RM) "$(datadir)/tracker/miners/$(service_DATA)" && \
+       $(RM) "$(servicedir)/$(service_DATA)"
 
 # Desktop files: First we fix the VERSION and libexecdir
 %.desktop.in: %.desktop.in.in


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]