[f-spot] Make install-data-hook respect DESTDIR



commit 9e926fbca4b9466ad13b95fb9de9921e7553a2ad
Author: Jim Ramsay <i am jimramsay com>
Date:   Mon Aug 10 14:03:38 2009 -0400

    Make install-data-hook respect DESTDIR
    
    Only GalleryExport did this right, set up all the others with a bad
    install-data-hook target to do things the same way.

 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..ff9f6db 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
+	if [ -w $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml ] ; then rm -f $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml; fi
 
 plugin_DATA =			\
 	$(PLUGIN_ASSEMBLY)
diff --git a/extensions/Exporters/PicasaWebExport/Makefile.am b/extensions/Exporters/PicasaWebExport/Makefile.am
index 4b39ee2..74200d3 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
+	if [ -w $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml ] ; then rm -f $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml; fi
 
 plugin_DATA =			\
 	$(PLUGIN_ASSEMBLY)
diff --git a/extensions/Exporters/SmugMugExport/Makefile.am b/extensions/Exporters/SmugMugExport/Makefile.am
index 5e2d8b6..a221343 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
+	if [ -w $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml ] ; then rm -f $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml; fi
 
 plugin_DATA =			\
 	$(PLUGIN_ASSEMBLY)
diff --git a/extensions/Exporters/TabbloExport/Makefile.am b/extensions/Exporters/TabbloExport/Makefile.am
index b4ffd33..5d73ddc 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
+	if [ -w $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml ] ; then rm -f $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml; fi
 
 plugin_DATA =			\
 	$(PLUGIN_ASSEMBLY)



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