diff options
| author |  Trevor Elliott <trevor@galois.com> | 2013-06-20 11:07:58 -0700 |
|---|---|---|
| committer | Trevor Elliott <trevor@galois.com> | 2013-06-20 11:07:58 -0700 |
| commit | fb7b4116ca156be854c19c114b015d975fea24ba (patch) | |
| tree | bfe81666219e65ab64ed0e0c9bfffeb5a919c8be /Makefile | |
| parent | a0ec01668bf62b609d19527a12e88552d6da36f4 (diff) | |
Fix #8
Pull when making actual changes, but trust that the build/gh-pages
directory was only ever created via the build system.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -90,7 +90,7 @@ else remote-url := $(shell $(git-cmd) config remote.origin.url) -$(build-dir)/gh-pages: $(topdir)/.git/index | $(build-dir) +$(build-dir)/gh-pages: | $(build-dir) $(call label,CLONE $(call drop-prefix,$@))\ ( $(git-cmd) clone $(if $(Q),-q) $(topdir) $@ \ && cd $@ \ @@ -107,6 +107,7 @@ generate: $(build-dir)/gh-pages/binaries/fiveui.xpi \ $(build-dir)/gh-pages/binaries/fiveui.crx $(call label,GENERATE)\ ( cd $(build-dir)/gh-pages \ + && $(git-cmd) pull $(if $(Q),-q) \ && $(git-cmd) add binaries \ && $(git-cmd) add -u binaries \ && $(git-cmd) commit $(if $(Q),-q) -m "deploy extensions" ) |