gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-18 21:33:32 +01:00
Code Issues Projects Releases Wiki Activity

Fix 'make install' on OS-X.

Browse Source
This commit is contained in:
Kris Maglione
2011-03-16 22:29:57 -04:00
parent 1f6c944488
commit 7b624705f7
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
common/Makefile
View File

@@ -1,13 +1,21 @@
#### configuration #### 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) TOP = $(shell pwd)
OS = $(shell uname -s) OS = $(shell uname -s)
BUILD_DATE = $(shell date "+%Y/%m/%d %H:%M:%S") BUILD_DATE = $(shell date "+%Y/%m/%d %H:%M:%S")
BASE = $(TOP)/../common BASE = $(TOP)/../common
GOOGLE_PROJ = dactyl GOOGLE_PROJ = dactyl
GOOGLE = https://$(GOOGLE_PROJ).googlecode.com/files GOOGLE = https://$(GOOGLE_PROJ).googlecode.com/files
VERSION ?= $(shell sed -n 's/.*em:version\(>\|="\)\(.*\)["<].*/\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) UUID := $(shell $(SED) -n 's/.*em:id(>|=")(.*)["<].*/\2/p' $(TOP)/install.rdf | sed 1q)
MANGLE := $(shell date '+%s' | awk '{ printf "%x", $$1 }') MANGLE := $(shell date '+%s' | awk '{ printf "%x", $$1 }')
MOZMILL = mozmill MOZMILL = mozmill
HOSTAPP_PATH = $(shell which $(HOSTAPP)) HOSTAPP_PATH = $(shell which $(HOSTAPP))
@@ -46,13 +54,6 @@ RDF_IN = $(RDF).in
BUILD_DIR = build.$(VERSION).$(OS) 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: .SILENT:
#### rules #### rules
@@ -121,7 +122,7 @@ install:
done; \ done; \
\ \
profile=$$(sed 's/^$$/\#/' "$$dir/profiles.ini" | \ profile=$$(sed 's/^$$/\#/' "$$dir/profiles.ini" | \
awk -v"profile=$(PROFILE)" \ awk -v "profile=$(PROFILE)" \
'BEGIN { RS="#" } \ 'BEGIN { RS="#" } \
index($$0, "\nName=" profile "\n") { print; exit } \ index($$0, "\nName=" profile "\n") { print; exit } \
!profile && /\nName=default\n/ { args["name=default"] = $$0 } \ !profile && /\nName=default\n/ { args["name=default"] = $$0 } \

2
pentadactyl/Makefile
View File

@@ -5,7 +5,7 @@ NAME = pentadactyl
FIREFOX ?= firefox FIREFOX ?= firefox
HOSTAPP ?= $(FIREFOX) HOSTAPP ?= $(FIREFOX)
PROFILEPATHS ?= "$$HOME/.mozilla/firefox" \ PROFILEPATHS ?= "$$HOME/.mozilla/firefox" \
"$$HOME/Library/Mozilla/Firefox" \ "$$HOME/Library/Application Support/Firefox" \
"$$APPDATA/Mozilla/Firefox" \ "$$APPDATA/Mozilla/Firefox" \
"$$AppData/Mozilla/Firefox" "$$AppData/Mozilla/Firefox"