[PATCH 2/2] Even more code reuse in version strings extractions.
Cristian Ionescu-Idbohrn
cristian.ionescu-idbohrn at axis.com
Sat Feb 16 08:31:37 PST 2013
Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn at axis.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 50939c9..ea0f333 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,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)")
# Mac Info.plist style with three numbers 1.2.3
-CFBUNDLEVERSION_STRING := $(shell git describe --tags --abbrev=12 | \
+CFBUNDLEVERSION_STRING := $(shell echo $(VERSION_STRING) | \
sed 's/^v\([^-]\+\)-.*/\1.0/' || echo "$(VERSION).0")
# Windows .nsi style with four numbers 1.2.3.4
PRODVERSION_STRING := $(CFBUNDLEVERSION_STRING).0
--
1.7.10.4
More information about the subsurface
mailing list