From 90715c52b471c4c540db0504381dc45501a6747c Mon Sep 17 00:00:00 2001 From: Leonard Koenig Date: Thu, 2 Apr 2015 15:23:44 +0200 Subject: [PATCH 1/2] Added option to override GOOGLE_CHROME detection; eg. for Chromium users --- browser-ext/login/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/browser-ext/login/Makefile b/browser-ext/login/Makefile index cb086de5..65114447 100644 --- a/browser-ext/login/Makefile +++ b/browser-ext/login/Makefile @@ -10,7 +10,10 @@ CFX=$(BUILD_DIR)/../../third_party/firefox-addon-sdk/bin/cfx CLOSURE_STRICT_FLAGS=--language_in ECMASCRIPT5_STRICT --warning_level VERBOSE --compilation_level ADVANCED_OPTIMIZATIONS --externs externs_node.js --jscomp_error missingProperties --jscomp_error checkTypes --jscomp_error checkRegExp --jscomp_error accessControls --jscomp_error const --jscomp_error missingReturn -ifeq ($(shell uname),Darwin) +ifneq ($(shell cat binary_name),) + GOOGLE_CHROME=$(shell cat binary_name) + $(info Found binary_name file; Setting $$GOOGLE_CHROME to [${GOOGLE_CHROME}]) +else ifeq ($(shell uname),Darwin) GOOGLE_CHROME="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" else GOOGLE_CHROME=google-chrome From 8a31183cc0fd740c278a73a3179f5a714e2459b3 Mon Sep 17 00:00:00 2001 From: Leonard Koenig Date: Thu, 2 Apr 2015 17:04:36 +0200 Subject: [PATCH 2/2] added .gitignore to ignore binary_name --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..2fd96b39 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +binary_name