From 50cf44da0db6513e4e5b94e0eb9290901c03628b Mon Sep 17 00:00:00 2001 From: Martyn Russell Date: Wed, 10 Dec 2014 16:31:55 +0000 Subject: miners: Don't break distcheck by removing $(DESTDIR) in Makefile.am --- src/miners/apps/Makefile.am | 4 ++-- src/miners/fs/Makefile.am | 4 ++-- src/miners/rss/Makefile.am | 4 ++-- src/miners/user-guides/Makefile.am | 4 ++-- src/plugins/evolution/Makefile.am | 4 ++-- src/tracker-extract/Makefile.am | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/miners/apps/Makefile.am b/src/miners/apps/Makefile.am index 1dbf2a1f8..c6a23d394 100644 --- a/src/miners/apps/Makefile.am +++ b/src/miners/apps/Makefile.am @@ -34,10 +34,10 @@ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard install-data-hook: $(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \ $(LN_S) -f "$(servicedir)/$(service_DATA)" \ - "$(datadir)/tracker/miners/$(service_DATA)" + "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" uninstall-local: - $(RM) "$(datadir)/tracker/miners/$(service_DATA)" && \ + $(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" && \ $(RM) "$(servicedir)/$(service_DATA)" # Desktop files: First we fix the VERSION and libexecdir diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am index adf28c525..c766a6003 100644 --- a/src/miners/fs/Makefile.am +++ b/src/miners/fs/Makefile.am @@ -68,10 +68,10 @@ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard install-data-hook: $(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \ $(LN_S) -f "$(servicedir)/$(service_DATA)" \ - "$(datadir)/tracker/miners/$(service_DATA)" + "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" uninstall-local: - $(RM) "$(datadir)/tracker/miners/$(service_DATA)" && \ + $(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" && \ $(RM) "$(servicedir)/$(service_DATA)" # Desktop files: First we fix the VERSION and libexecdir diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am index 6652f829b..c63ebcd06 100644 --- a/src/miners/rss/Makefile.am +++ b/src/miners/rss/Makefile.am @@ -34,10 +34,10 @@ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard install-data-hook: $(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \ $(LN_S) -f "$(servicedir)/$(service_DATA)" \ - "$(datadir)/tracker/miners/$(service_DATA)" + "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" uninstall-local: - $(RM) "$(datadir)/tracker/miners/$(service_DATA)" && \ + $(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" && \ $(RM) "$(servicedir)/$(service_DATA)" # Desktop files: First we fix the VERSION and libexecdir diff --git a/src/miners/user-guides/Makefile.am b/src/miners/user-guides/Makefile.am index 418a6b683..767ed7b6f 100644 --- a/src/miners/user-guides/Makefile.am +++ b/src/miners/user-guides/Makefile.am @@ -34,10 +34,10 @@ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard install-data-hook: $(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \ $(LN_S) -f "$(servicedir)/$(service_DATA)" \ - "$(datadir)/tracker/miners/$(service_DATA)" + "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" uninstall-local: - $(RM) "$(datadir)/tracker/miners/$(service_DATA)" && \ + $(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" && \ $(RM) "$(servicedir)/$(service_DATA)" # Desktop files: First we fix the VERSION and libexecdir diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am index c94d233f1..dcdd886cd 100644 --- a/src/plugins/evolution/Makefile.am +++ b/src/plugins/evolution/Makefile.am @@ -56,10 +56,10 @@ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard install-data-hook: $(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \ $(LN_S) -f "$(servicedir)/$(service_DATA)" \ - "$(datadir)/tracker/miners/$(service_DATA)" + "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" uninstall-local: - $(RM) "$(datadir)/tracker/miners/$(service_DATA)" && \ + $(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" && \ $(RM) "$(servicedir)/$(service_DATA)" # Dist / Clean rules for all data diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am index 4448bf721..c86cab802 100644 --- a/src/tracker-extract/Makefile.am +++ b/src/tracker-extract/Makefile.am @@ -588,10 +588,10 @@ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard install-data-hook: $(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \ $(LN_S) -f "$(servicedir)/$(service_DATA)" \ - "$(datadir)/tracker/miners/$(service_DATA)" + "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" uninstall-local: - $(RM) "$(datadir)/tracker/miners/$(service_DATA)" && \ + $(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" && \ $(RM) "$(servicedir)/$(service_DATA)" # Desktop files: First we fix the VERSION and libexecdir -- cgit v1.2.1