Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf

Remove ZM_VERSION from zm.conf

scripts/ZoneMinder/lib/ZoneMinder/Base.pm.in

@@ -32,6 +32,8 @@ require Exporter;
 
 our @ISA = qw(Exporter);
 
+use constant ZM_VERSION => "@VERSION@";
+
 # Items to export into callers namespace by default. Note: do not export
 # names by default without a very good reason. Use EXPORT_OK instead.
 # Do not simply export all your public functions/methods/constants.
@@ -39,7 +41,7 @@ our @ISA = qw(Exporter);
 # This allows declaration	use ZoneMinder ':all';
 # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
 # will save memory.
-our %EXPORT_TAGS = ( 'all' => [ qw() ] );
+our %EXPORT_TAGS = ( 'all' => [ qw(ZM_VERSION) ] );
 
 our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
 

scripts/zmdbbackup.in

@@ -20,6 +20,8 @@
 # Edit these to suit your configuration
 ZM_CONFIG=@ZM_CONFIG@
 source $ZM_CONFIG
+# ZM_VERSION in the config is now deprecated but will likely still exist in people's config files. This will override it.
+ZM_VERSION=@VERSION@
 
 MYSQLDUMP=/usr/bin/mysqldump
 BACKUP_PATH=/var/lib/zm

scripts/zmeventdump.in

@@ -23,6 +23,8 @@
 
 # Edit these to suit your configuration
 ZM_CONFIG=@ZM_CONFIG@
+# ZM_VERSION in the config is now deprecated but will likely still exist in people's config files. This will override it.
+ZM_VERSION=@VERSION@
 MYSQLDUMP=/usr/bin/mysqldump
 
 # The rest should not need editing