diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-25 10:14:30 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-25 10:18:59 -0700 |
| commit | cacd371bee57f00fd9eddac70570401495a7157f (patch) | |
| tree | 24727e286adf0e826c523da772f2ff556c886469 /crawl-ref/source/makefile | |
| parent | b127eb5181fb4f1b26a794bc083c0ea85c2d3d6e (diff) | |
| download | crawl-ref-cacd371bee57f00fd9eddac70570401495a7157f.tar.gz crawl-ref-cacd371bee57f00fd9eddac70570401495a7157f.zip | |
makefile: allow build.h to be generated based on git-merge-base
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/makefile')
| -rw-r--r-- | crawl-ref/source/makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 1b36d16eb4..da620bbf7c 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -142,6 +142,10 @@ ifdef NEED_STATIC LDFLAGS += -static endif +ifdef USE_MERGE_BASE +MERGE_BASE := $(shell git merge-base HEAD $(USE_MERGE_BASE)) +endif + # Permissions to set on the game executable. MCHMOD := 2755 @@ -605,7 +609,7 @@ compflag.h: $(QUIET_GEN)util/gen-cflg.pl compflag.h "$(CFLAGS)" "$(CFLAGS_L)" "$(LDFLAGS)" build.h: - $(QUIET_GEN)util/gen_ver.pl $@ + $(QUIET_GEN)util/gen_ver.pl $@ $(MERGE_BASE) version.cc: build.h compflag.h |