[Devil-linux-commit] build/scripts ZoneMinder,1.6,1.7

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32218/scripts

Modified Files:
	ZoneMinder 
Log Message:
updated to latest zoneminder version from git


Index: ZoneMinder
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ZoneMinder,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ZoneMinder	23 Dec 2015 18:28:42 -0000	1.6
+++ ZoneMinder	8 May 2016 15:09:53 -0000	1.7
@@ -32,7 +32,7 @@
 		    -DZM_CGIDIR=/usr/libexec/zoneminder/cgi-bin -DZM_LOGDIR=/var/log -DZM_RUNDIR=/var/run \
 		    -DZM_SOCKDIR=/var/run || exit 1
 		make $PMAKE || exit 1
-
+		./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes || exit 1
 	fi
 	;;
 
@@ -56,9 +56,6 @@
 		cp $MYDIR/scripts/zoneminder.conf $ETCDIR/etc/apache2/extra/ || exit 1
 		cp $MYDIR/scripts/zoneminder.logrotate $ETCDIR/etc/logrotate.d/ || exit 1
 		
-		#echo ZM_OPT_CAMBOZOLA=true  >> $ETCDIR/etc/zm.conf 
-		#echo ZM_PATH_CAMBOZOLA=/tools/cambozola.jar  >> $ETCDIR/etc/zm.conf 
-
 		echo "# Start ZoneMinder?" >> $CONFIGFILE
 		echo "START_ZONEMINDER=no" >> $CONFIGFILE
 		echo >> $CONFIGFILE