From 7eb7772b6132b5f4c66ffde8f59e12126072855f Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 7 Jan 2011 02:26:46 +1100
Subject: [PATCH] Support make install{xpi} for {Melo,Tele}dactyl.

---
 common/Makefile     | 8 ++++----
 melodactyl/Makefile | 8 ++++----
 teledactyl/Makefile | 7 +++++++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/common/Makefile b/common/Makefile
index 22bb0c4b..47789fda 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -64,9 +64,9 @@ help:
 	@echo "  make jar        - build a JAR ($(JAR))"
 	@echo "  make xpi        - build an XPI ($(XPI_NAME))"
 	@echo "  make installxpi - build an XPI and install it to your profile"
-	@echo "  make install    - installs this source tree directly to your Firefox profile"
-	@echo '                    set $$PROFILE to select a profile and $$PROFILEPATHS to change'
-	@echo '                    the directory where profiles are searched'
+	@echo "  make install    - installs this source tree directly to your $(HOSTAPP) profile"
+	@echo '                    set $$PROFILE to select a profile by name and $$PROFILEPATHS'
+	@echo '                    to change the directory where profiles are searched'
 	@echo "  make release    - updates update.rdf (this is not for you)"
 	@echo "  make dist       - uploads to Google Code (this is not for you)"
 	@echo "  make clean      - clean up"
@@ -140,7 +140,7 @@ install:
 	else pwd; 								\
 	fi >"$$ext"
 installxpi: xpi
-	$(FIREFOX) $(XPI)
+	$(HOSTAPP) $(XPI)
 
 $(RDF): $(RDF_IN) Makefile
 	@echo "Preparing release..."
diff --git a/melodactyl/Makefile b/melodactyl/Makefile
index 3ac51eb2..ed90a968 100644
--- a/melodactyl/Makefile
+++ b/melodactyl/Makefile
@@ -2,10 +2,10 @@
 
 NAME          = melodactyl
 
-FIREFOX      ?= songbird
+SONGBIRD     ?= songbird
 HOSTAPP      ?= $(SONGBIRD)
-PROFILEPATHS ?= "$$HOME/.songbird" \
-		"$$HOME/Library/Songbird" \
-		"$$APPDATA/Songbird"
+PROFILEPATHS ?= "$$HOME/.songbird2" \
+		"$$HOME/Library/Songbird2" \
+		"$$APPDATA/Songbird2"
 
 include ../common/Makefile
diff --git a/teledactyl/Makefile b/teledactyl/Makefile
index e26e3a94..46abb521 100644
--- a/teledactyl/Makefile
+++ b/teledactyl/Makefile
@@ -2,4 +2,11 @@
 
 NAME          = teledactyl
 
+THUNDERBIRD  ?= thunderbird
+HOSTAPP      ?= $(THUNDERBIRD)
+PROFILEPATHS ?= "$$HOME/.thunderbird" \
+		"$$HOME/Library/Thunderbird" \
+		"$$APPDATA/Thunderbird" \
+		"$$AppData/Thunderbird"
+
 include ../common/Makefile