diff options
| author | Kris Maglione <maglione.k@gmail.com> | 2010-09-30 18:03:31 -0400 |
|---|---|---|
| committer | Kris Maglione <maglione.k@gmail.com> | 2010-09-30 18:03:31 -0400 |
| commit | e1d589ab9e59814188e7ddaa619a1ea241da4aae (patch) | |
| tree | 0c9c940aaadc2bd8309333099683c7f014692d63 /common | |
| parent | 0c76304f205ec9211e9b1052f9af19b2d017df59 (diff) | |
| download | pentadactyl-e1d589ab9e59814188e7ddaa619a1ea241da4aae.tar.gz | |
Support Windows/OS-X in 'make install'. Closes issue #33.
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/common/Makefile b/common/Makefile index b0dfb26f..7d5c101c 100644 --- a/common/Makefile +++ b/common/Makefile @@ -41,9 +41,6 @@ BUILD_DIR = build.$(VERSION).$(OS) AWK ?= awk B64ENCODE ?= base64 CURL ?= curl -FIREFOX ?= firefox -PROFILES ?= $(HOME)/.mozilla/firefox -export PROFILES .SILENT: @@ -66,8 +63,8 @@ help: @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 $$PROFILES to change' - @echo ' the directory where profiles are searched for' + @echo ' set $$PROFILE to select a profile and $$PROFILEPATHS to change' + @echo ' 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" @@ -107,14 +104,22 @@ dist: $(XPI) -i "$(GOOGLE)" | sed -n '/^Location/{p;q;}' install: - profile=$${PROFILE:-$$(sed 's/^$$/\#/' $(PROFILES)/profiles.ini |\ + export dir; \ + for dir in $(PROFILEPATHS); do \ + test -f "$$dir/profiles.ini" && break; \ + done; \ + profile=$${PROFILE:-$$(sed 's/^$$/\#/' "$$dir/profiles.ini" |\ awk -v"profile=$(PROFILE)" \ 'BEGIN { RS="#" } index("\n" profile "\n", $$0) || !profile && /\nDefault=1/' |\ awk -F= '{ args[$$1] = $$2 } \ END {\ - if (args["IsRelative"]) print ENVIRON["PROFILES"] "/" args["Path"];\ + if (args["IsRelative"]) print ENVIRON["dir"] "/" args["Path"];\ else print args["Path"]\ }')}; \ + if ! test -d "$$profile"; then \ + echo >&2 "Can't locate profile directory"; \ + exit 1; \ + fi; \ ext="$$profile/extensions/$(UUID)"; \ rm -f "$$ext.xpi"; \ rm -rf "$$ext"; \ |