summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Callaghan <dcallagh@redhat.com>2013-04-29 09:38:29 +1000
committerDan Callaghan <dcallagh@redhat.com>2013-04-29 09:59:16 +1000
commit80c14f4383bf2e5021fd18bc781fee37aae0b420 (patch)
treecdbfba353002347f76aea762304b644cf2da0a87
parentd5adabb03e6edc41629fdc881ee540df151edb56 (diff)
avoid GIT_DIR shenanigans with submodules
-rw-r--r--Makefile6
-rw-r--r--README3
2 files changed, 3 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index b73ec2a..8e57c45 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
SHELL = /bin/bash
BEAKER = beaker-branches/master
-BEAKER_GIT = beaker-branches/master
+BEAKER_GIT = .git/modules/beaker-branches/master
SPHINXBUILD = $(shell command -v sphinx-1.0-build sphinx-build)
SPHINXBUILDOPTS =
@@ -53,8 +53,8 @@ schema/beaker-job.rng: $(BEAKER)/Common/bkr/common/schema/beaker-job.rng
.PHONY:
git-rev-beaker-master:
read old_sha <$@ ; \
- new_sha="$$(GIT_DIR=$(BEAKER_GIT) git rev-parse HEAD)" ; \
- [[ $$old_sha != $$new_sha ]] && echo $$new_sha >$@
+ new_sha=$$(git ls-tree HEAD beaker-branches/master | awk '{ print $$3 }') && \
+ if [[ $$old_sha != $$new_sha ]] ; then echo $$new_sha >$@ ; fi
downloads.mk: git-rev-beaker-master generate-downloads-mk.py git_tags.py
./generate-downloads-mk.py $(BEAKER_GIT) >$@
diff --git a/README b/README
index 85290c8..fec94c4 100644
--- a/README
+++ b/README
@@ -28,9 +28,6 @@ Dependencies
* pandoc
* python-dulwich (to generate release changelogs)
-You may also need to run "touch git-rev-beaker-master" to avoid an error
-from the make file
-
Building docs from a local checkout
-----------------------------------