From 7b624705f794bdb6385c5647d316dddaa38ad904 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 16 Mar 2011 22:29:57 -0400
Subject: [PATCH] Fix 'make install' on OS-X.

---
 common/Makefile      | 21 +++++++++++----------
 pentadactyl/Makefile |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/common/Makefile b/common/Makefile
index 955d358a..0b119d09 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -1,13 +1,21 @@
 #### configuration
 
+
+AWK       ?= awk
+B64ENCODE ?= base64
+CURL      ?= curl
+SED       := $(shell if [ "xoo" = x$$(echo foo | sed -E 's/f(o)/\1/' 2>/dev/null) ]; \
+		     then echo sed -E; else echo sed -r;			     \
+		     fi)
+
 TOP           = $(shell pwd)
 OS            = $(shell uname -s)
 BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 BASE          = $(TOP)/../common
 GOOGLE_PROJ   = dactyl
 GOOGLE	      = https://$(GOOGLE_PROJ).googlecode.com/files
-VERSION	     ?= $(shell sed -n 's/.*em:version\(>\|="\)\(.*\)["<].*/\2/p' $(TOP)/install.rdf | sed 1q)
-UUID   	     := $(shell sed -n 's/.*em:id\(>\|="\)\(.*\)["<].*/\2/p' $(TOP)/install.rdf | sed 1q)
+VERSION	     ?= $(shell $(SED) -n 's/.*em:version(>|=")(.*)["<].*/\2/p' $(TOP)/install.rdf | sed 1q)
+UUID   	     := $(shell $(SED) -n 's/.*em:id(>|=")(.*)["<].*/\2/p' $(TOP)/install.rdf | sed 1q)
 MANGLE	     := $(shell date '+%s' | awk '{ printf "%x", $$1 }')
 MOZMILL       = mozmill
 HOSTAPP_PATH  = $(shell which $(HOSTAPP))
@@ -46,13 +54,6 @@ RDF_IN        = $(RDF).in
 
 BUILD_DIR     = build.$(VERSION).$(OS)
 
-AWK       ?= awk
-B64ENCODE ?= base64
-CURL      ?= curl
-SED       := $(shell if [ "xoo" = x$$(echo foo | sed -E 's/f(o)/\1/' 2>/dev/null) ]; \
-		     then echo sed -E; else echo sed -r;			     \
-		     fi)
-
 .SILENT:
 
 #### rules
@@ -121,7 +122,7 @@ install:
 	done; 									\
 										\
 	profile=$$(sed 's/^$$/\#/' "$$dir/profiles.ini" |			\
-		awk -v"profile=$(PROFILE)" 					\
+		awk -v "profile=$(PROFILE)"					\
 			'BEGIN { RS="#" } 					\
 			index($$0, "\nName=" profile "\n") { print; exit } 	\
 			!profile && /\nName=default\n/ { args["name=default"] = $$0 } 	\
diff --git a/pentadactyl/Makefile b/pentadactyl/Makefile
index 74afcb96..810d7c4c 100644
--- a/pentadactyl/Makefile
+++ b/pentadactyl/Makefile
@@ -5,7 +5,7 @@ NAME          = pentadactyl
 FIREFOX      ?= firefox
 HOSTAPP      ?= $(FIREFOX)
 PROFILEPATHS ?= "$$HOME/.mozilla/firefox" \
-		"$$HOME/Library/Mozilla/Firefox" \
+		"$$HOME/Library/Application Support/Firefox" \
 		"$$APPDATA/Mozilla/Firefox" \
 		"$$AppData/Mozilla/Firefox"