summaryrefslogtreecommitdiff
blob: 73469dca89dec967ba269744d4e1101fdd2b43a9 (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
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
From 82322bb8461eca5a06e2ec05a5705bc52fada244 Mon Sep 17 00:00:00 2001
From: Jim Ramsay <i.am@jimramsay.com>
Date: Mon, 10 Aug 2009 14:03:38 -0400
Subject: [PATCH 19/19] Make install-data-hook respect DESTDIR

---
 extensions/Exporters/FlickrExport/Makefile.am    |    2 +-
 extensions/Exporters/PicasaWebExport/Makefile.am |    2 +-
 extensions/Exporters/SmugMugExport/Makefile.am   |    2 +-
 extensions/Exporters/TabbloExport/Makefile.am    |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/Exporters/FlickrExport/Makefile.am b/extensions/Exporters/FlickrExport/Makefile.am
index 2535352..46c70e6 100644
--- a/extensions/Exporters/FlickrExport/Makefile.am
+++ b/extensions/Exporters/FlickrExport/Makefile.am
@@ -45,7 +45,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
 plugindir = $(pkglibdir)/extensions
 
 install-data-hook:
-	rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
+	-rm -f "$(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml"
 
 plugin_DATA =			\
 	$(PLUGIN_ASSEMBLY)
diff --git a/extensions/Exporters/PicasaWebExport/Makefile.am b/extensions/Exporters/PicasaWebExport/Makefile.am
index 4b39ee2..25d0322 100644
--- a/extensions/Exporters/PicasaWebExport/Makefile.am
+++ b/extensions/Exporters/PicasaWebExport/Makefile.am
@@ -46,7 +46,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
 plugindir = $(pkglibdir)/extensions
 
 install-data-hook:
-	rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
+	-rm -f "$(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml"
 
 plugin_DATA =			\
 	$(PLUGIN_ASSEMBLY)
diff --git a/extensions/Exporters/SmugMugExport/Makefile.am b/extensions/Exporters/SmugMugExport/Makefile.am
index 5e2d8b6..bed9b68 100644
--- a/extensions/Exporters/SmugMugExport/Makefile.am
+++ b/extensions/Exporters/SmugMugExport/Makefile.am
@@ -46,7 +46,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
 plugindir = $(pkglibdir)/extensions
 
 install-data-hook:
-	rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
+	-rm -f "$(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml"
 
 plugin_DATA =			\
 	$(PLUGIN_ASSEMBLY)
diff --git a/extensions/Exporters/TabbloExport/Makefile.am b/extensions/Exporters/TabbloExport/Makefile.am
index b4ffd33..233ba73 100644
--- a/extensions/Exporters/TabbloExport/Makefile.am
+++ b/extensions/Exporters/TabbloExport/Makefile.am
@@ -55,7 +55,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
 plugindir = $(pkglibdir)/extensions
 
 install-data-hook:
-	rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
+	-rm -f "$(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml"
 
 plugin_DATA =			\
 	$(PLUGIN_ASSEMBLY)
-- 
1.6.3.3