From fb7b4116ca156be854c19c114b015d975fea24ba Mon Sep 17 00:00:00 2001
From: Trevor Elliott <trevor@galois.com>
Date: Thu, 20 Jun 2013 11:07:58 -0700
Subject: Fix #8

  Pull when making actual changes, but trust that the build/gh-pages
directory was only ever created via the build system.
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 2cb7956..b9c915c 100644
--- a/Makefile
+++ b/Makefile
@@ -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" )
-- 
cgit v1.2.3