[tracker] thunderbird, firefox: Use -f with ln to force destination and use $(MKDIR_P)



commit 9777bf75b8f7b65483dab11dee64520e0002bcfb
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Aug 2 15:09:18 2011 +0100

    thunderbird, firefox: Use -f with ln to force destination and use $(MKDIR_P)
    
    Without this make install after the initial attempt would cause errors due to
    destination already existing.
    
    Also switched mkdir -p to $(MKDIR_P)

 src/plugins/firefox/Makefile.am     |    4 ++--
 src/plugins/thunderbird/Makefile.am |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/plugins/firefox/Makefile.am b/src/plugins/firefox/Makefile.am
index e5ebebf..7d0f5a8 100644
--- a/src/plugins/firefox/Makefile.am
+++ b/src/plugins/firefox/Makefile.am
@@ -12,8 +12,8 @@ extension_DATA = \
 EXTRA_DIST = $(extension_DATA)
 
 install-data-hook:
-	mkdir -p "$(DESTDIR)$(TRACKER_MINER_FIREFOX_INSTALL_DIR)"
-	$(LN_S) "$(extensiondir)" "$(DESTDIR)$(TRACKER_MINER_FIREFOX_INSTALL_DIR)/trackerfox bustany org"
+	$(MKDIR_P) "$(DESTDIR)$(TRACKER_MINER_FIREFOX_INSTALL_DIR)"
+	$(LN_S) -f "$(extensiondir)" "$(DESTDIR)$(TRACKER_MINER_FIREFOX_INSTALL_DIR)/trackerfox bustany org"
 
 uninstall-hook:
 	$(RM) "$(DESTDIR)$(TRACKER_MINER_FIREFOX_INSTALL_DIR)/trackerfox bustany org"
diff --git a/src/plugins/thunderbird/Makefile.am b/src/plugins/thunderbird/Makefile.am
index af86594..284648b 100644
--- a/src/plugins/thunderbird/Makefile.am
+++ b/src/plugins/thunderbird/Makefile.am
@@ -11,8 +11,8 @@ extension_DATA = \
 EXTRA_DIST = $(extension_DATA)
 
 install-data-hook:
-	mkdir -p "$(DESTDIR)$(TRACKER_MINER_THUNDERBIRD_INSTALL_DIR)"
-	$(LN_S) "$(extensiondir)" "$(DESTDIR)$(TRACKER_MINER_THUNDERBIRD_INSTALL_DIR)/trackerbird bustany org"
+	$(MKDIR_P) "$(DESTDIR)$(TRACKER_MINER_THUNDERBIRD_INSTALL_DIR)"
+	$(LN_S) -f "$(extensiondir)" "$(DESTDIR)$(TRACKER_MINER_THUNDERBIRD_INSTALL_DIR)/trackerbird bustany org"
 
 uninstall-hook:
 	$(RM) "$(DESTDIR)$(TRACKER_MINER_THUNDERBIRD_INSTALL_DIR)/trackerbird bustany org"



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