Fix Makefile to support the +CVS string and include it in releasename

Makefile

@@ -3,7 +3,7 @@
 all: release
 
 # Ugly hack to get the version number from Pisg.pm
-VERSION = $(shell grep "version =>" modules/Pisg.pm | sed 's/.*\"\(.*\)\".*/\1/')
+VERSION = $(shell grep "version =>" modules/Pisg.pm | sed 's/[^"]*"\([^"]*\)".*/\1/')$(shell test -d ./CVS && echo "+CVS_$$(date +%Y%m%d)")
 
 DIRNAME = pisg-$(VERSION)
 

docs/Changelog

@@ -32,6 +32,7 @@ pisg (0.69) - ??
      + Fix title tooltip (SF #1492153).
      + Fix -cchannels option (SF #1369457).
      + Fix uninitialised values in charts (SF #1354920 and #1498999)
+     + Fix Makefile to support the +CVS string and include it in releasename
    * Features:
      + Add "+CVS" to versionstring if ./CVS is found
    * Parsers:

docs/Makefile

@@ -1,6 +1,6 @@
 all: pisg-doc.txt pisg-doc.html pisg.1
 
-VERSION = $(shell grep "version =>" ../modules/Pisg.pm | sed 's/.*\"\(.*\)\".*/\1/')
+VERSION = $(shell grep "version =>" modules/Pisg.pm | sed 's/[^"]*"\([^"]*\)".*/\1/')$(shell test -d ./CVS && echo "+CVS_$$(date +%Y%m%d)")
 
 pisg-doc.xml: .version
 .version: ../modules/Pisg.pm