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

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

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

Modified Files:
	ZoneMinder 
Log Message:
fix zoneminder install for latest version


Index: ZoneMinder
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ZoneMinder,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ZoneMinder	21 Dec 2015 00:22:56 -0000	1.5
+++ ZoneMinder	23 Dec 2015 18:28:42 -0000	1.6
@@ -17,17 +17,20 @@
 case $1 in
     build )
 	if [ "$CONFIG_ZONEMINDER" = "y" ] ; then
-		./bootstrap.sh || exit 1
-		EXTRACFG=""
-		if [ "$CONFIG_CPU" = "x86_64" ]; then
-		    EXTRACFG="-with-libarch=lib64"
-		else
-		    EXTRACF="--with-libarch=lib"
-		fi
-		./configure --prefix=/usr --sysconfdir=/etc --with-webuser=www --with-webgroup=www \
-			--without-mariadb --with-mysql=/usr --with-ffmpeg=/usr --with-webdir=/var/zoneminder \
-			--with-cgidir=/usr/libexec/zoneminder/cgi-bin  ${EXTRACFG} \
-			--disable-debug --enable-mmap=yes ZM_SSL_LIB=openssl || exit 1
+		#./bootstrap.sh || exit 1
+		#EXTRACFG=""
+		#if [ "$CONFIG_CPU" = "x86_64" ]; then
+		#    EXTRACFG="-with-libarch=lib64"
+		#else
+		#    EXTRACF="--with-libarch=lib"
+		#fi
+		#./configure --prefix=/usr --sysconfdir=/etc --with-webuser=www --with-webgroup=www \
+		#	--without-mariadb --with-mysql=/usr --with-ffmpeg=/usr --with-webdir=
+		#	--with-cgidir=/usr/libexec/zoneminder/cgi-bin  ${EXTRACFG} \
+		#	--disable-debug --enable-mmap=yes ZM_SSL_LIB=openssl || exit 1
+		cmake -DCMAKE_INSTALL_PREFIX=/usr -DZM_WEB_GROUP=www -DZM_WEB_USER=www -DZM_WEBDIR=/var/zoneminder \
+		    -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
 
 	fi