From 29e73be9f2958c8ae3c4eb9efe6d602e89e2c6ae Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 1 Feb 2013 18:03:39 +1100 Subject: Fix the rules for creating the windows .nsi file This was one of the reasons why I tagged version 2.9. I wanted to test all the Makefile magic we added to get sane and automated versions on Windows and Linux. And it turned out my sed script failed in rather obvious ways. These changes appear to fix that - but of course you won't see that unless you reset your git repository to the tag and manually apply this patch. Signed-off-by: Dirk Hohndel --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 20d13e2b5..da838bac9 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ XSLTFILES = xslt/*.xslt UNAME := $(shell $(CC) -dumpmachine 2>&1 | grep -E -o "linux|darwin|win") VERSION_STRING := $(shell git describe --tags --abbrev=12 || echo "v$(VERSION)") -PRODVERSION_STRING := $(shell git describe --tags --abbrev=12 | sed 's/v\([0-9]*\)\.\([0-9]*\)-\([0-9]*\)-.*/\1.\2.\3.0/' || echo "$(VERSION).0.0") +PRODVERSION_STRING := $(shell git describe --tags --abbrev=12 | sed 's/v\([0-9]*\)\.\([0-9]*\)-\([0-9]*\)-.*/\1.\2.\3.0/ ; s/v\([0-9]\)\.\([0-9]*\)/\1.\2.0.0/' || echo "$(VERSION).0.0") # find libdivecomputer # First deal with the cross compile environment and with Mac. @@ -219,7 +219,7 @@ install-cross-windows: $(NAME) create-windows-installer: $(NAME) $(NSIFILE) install-cross-windows $(MAKENSIS) $(NSIFILE) -$(NSIFILE): $(NSIINPUTFILE) +$(NSIFILE): $(NSIINPUTFILE) Makefile $(shell cat $(NSIINPUTFILE) | sed -e 's/VERSIONTOKEN/$(VERSION_STRING)/;s/PRODVTOKEN/$(PRODVERSION_STRING)/' > $(NSIFILE)) -- cgit v1.2.3-70-g09d2