From c45c1112377c5de6d4d29bfe0a6eefa63a116537 Mon Sep 17 00:00:00 2001 From: David Brown Date: Thu, 30 Jun 2016 20:11:09 +0100 Subject: [PATCH] Add brnachname to checksum fileneame. --- makefile | 3 ++- src/tools/make/vishap.make | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index 777da4a7..1b18dec3 100644 --- a/makefile +++ b/makefile @@ -98,13 +98,14 @@ usage: -# Generate config files Configuration.Make and Configuartion.Mod +# Generate config files Configuration.Make and Configuration.Mod FORCE: configuration: FORCE @$(CC) -I src/system -o a.o src/tools/make/configure.c @./a.o @rm a.o + @echo BRANCH=$$(git rev-parse --abbrev-ref HEAD)>>Configuration.Make diff --git a/src/tools/make/vishap.make b/src/tools/make/vishap.make index 54ee3289..c9edfa55 100644 --- a/src/tools/make/vishap.make +++ b/src/tools/make/vishap.make @@ -363,7 +363,7 @@ library: v4 ooc2 ooc ulm pow32 misc s3 librarybinary checksum: - @cd $(BUILDDIR) && sh $(ROOTDIR)/src/tools/make/checksumtest.sh $(ROOTDIR)/$(BUILDDIR).md5 + @cd $(BUILDDIR) && sh $(ROOTDIR)/src/tools/make/checksumtest.sh $(ROOTDIR)/$(BUILDDIR).$(BRANCH).md5