aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Trevor Elliott <trevor@galois.com>2013-06-21 14:29:28 -0700
committerGravatar Trevor Elliott <trevor@galois.com>2013-06-21 14:40:26 -0700
commit4b9a4468238b96482478b3fabdfe6fb8cabb4fd6 (patch)
treec904129516281f7984cb350981843af3565bd35a /src
parentd538e07c07c6057126748ac9cccac3139600be5b (diff)
Populate the gh-pages branch of the repo
Diffstat (limited to 'src')
-rw-r--r--src/js/chrome/build.mk1
-rw-r--r--src/js/firefox/build.mk8
2 files changed, 4 insertions, 5 deletions
diff --git a/src/js/chrome/build.mk b/src/js/chrome/build.mk
index 30c07f3..f06fb20 100644
--- a/src/js/chrome/build.mk
+++ b/src/js/chrome/build.mk
@@ -6,6 +6,7 @@ all: stage-chrome
package: $(build-dir)/fiveui.crx
+
chrome-dir := $(path)
chrome-build := $(build-dir)/chrome
diff --git a/src/js/firefox/build.mk b/src/js/firefox/build.mk
index 0a20a80..36fad92 100644
--- a/src/js/firefox/build.mk
+++ b/src/js/firefox/build.mk
@@ -83,10 +83,8 @@ stage-firefox: \
$(firefox-build)/data/icons/options-icon.js \
| $(firefox-build)
-$(build-dir)/fiveui.xpi: \
- stage-firefox \
- $(addon-sdk-unpacked) \
- $(topdir)/profiles/firefox
+$(build-dir)/fiveui.xpi: stage-firefox \
+ | $(topdir)/profiles/firefox $(addon-sdk-unpacked)
$(call label,XPI $(call drop-prefix,$@))\
$(call cfx,$(build-dir),xpi -p $(topdir)/profiles/firefox \
--pkgdir=$(firefox-build) )
@@ -94,5 +92,5 @@ $(build-dir)/fiveui.xpi: \
# Testing ######################################################################
-run-firefox: stage-firefox $(addon-sdk-unpacked)
+run-firefox: stage-firefox | $(addon-sdk-unpacked)
$(call label,RUNFF)$(call cfx,$(firefox-build),run)