2180d71d50
- Rebase patches. - Update mootools download location. - Update to mootools 1.2.3. - Add additional dependencies for some optional features.
143 lines
4 KiB
Diff
143 lines
4 KiB
Diff
diff -up ./configure.ac.dbinstall ./configure.ac
|
|
--- ./configure.ac.dbinstall 2009-06-24 05:22:23.000000000 -0500
|
|
+++ ./configure.ac 2009-07-19 22:40:16.000000000 -0500
|
|
@@ -1,11 +1,9 @@
|
|
AC_PREREQ(2.59)
|
|
-AC_INIT(zm,1.24.2,support@zoneminder.com,ZoneMinder)
|
|
+AC_INIT(zm,1.24.2,support@zoneminder.com,zoneminder)
|
|
AM_INIT_AUTOMAKE
|
|
AC_CONFIG_SRCDIR(src/zm.h)
|
|
AM_CONFIG_HEADER(config.h)
|
|
|
|
-PATH_BUILD=`pwd`
|
|
-AC_SUBST(PATH_BUILD)
|
|
TIME_BUILD=`date +'%s'`
|
|
AC_SUBST(TIME_BUILD)
|
|
|
|
@@ -319,8 +317,10 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
|
|
|
|
AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
|
|
AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
|
|
+AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
|
|
+AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
|
|
AC_SUBST(RUNDIR,"/var/run")
|
|
-AC_SUBST(ZM_RUNDIR,"$RUNDIR/zm")
|
|
+AC_SUBST(ZM_RUNDIR,"$RUNDIR/$PACKAGE")
|
|
AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
|
|
AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
|
|
AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
|
|
diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
|
|
--- ./db/Makefile.am.dbinstall 2009-03-31 09:06:34.000000000 -0500
|
|
+++ ./db/Makefile.am 2009-07-19 22:27:02.000000000 -0500
|
|
@@ -1,7 +1,16 @@
|
|
AUTOMAKE_OPTIONS = gnu
|
|
|
|
+zmdbdatadir = $(pkgdatadir)/db
|
|
+
|
|
EXTRA_DIST = \
|
|
zm_create.sql.in \
|
|
+ $(dbupgrade_scripts)
|
|
+
|
|
+dist_zmdbdata_DATA = \
|
|
+ zm_create.sql \
|
|
+ $(dbupgrade_scripts)
|
|
+
|
|
+dbupgrade_scripts = \
|
|
zm_update-0.0.1.sql \
|
|
zm_update-0.9.7.sql \
|
|
zm_update-0.9.8.sql \
|
|
diff -up ./scripts/zm.in.dbinstall ./scripts/zm.in
|
|
--- ./scripts/zm.in.dbinstall 2009-03-20 07:07:02.000000000 -0500
|
|
+++ ./scripts/zm.in 2009-07-19 22:27:02.000000000 -0500
|
|
@@ -6,10 +6,10 @@
|
|
# Source function library.
|
|
. /etc/rc.d/init.d/functions
|
|
|
|
-prog=ZoneMinder
|
|
+prog="@PACKAGE@"
|
|
ZM_CONFIG="@ZM_CONFIG@"
|
|
pidfile="@ZM_RUNDIR@"
|
|
-LOCKFILE=/var/lock/subsys/zm
|
|
+LOCKFILE=/var/lock/subsys/$prog
|
|
|
|
loadconf()
|
|
{
|
|
@@ -27,9 +27,8 @@ command="$ZM_PATH_BIN/zmpkg.pl"
|
|
start()
|
|
{
|
|
zmupdate || return $?
|
|
- loadconf || return $?
|
|
#Make sure the directory for our PID folder exists or create one.
|
|
- [ ! -d /var/run/zm ] \
|
|
+ [ ! -d $pidfile ] \
|
|
&& mkdir -m 774 $pidfile \
|
|
&& chown $ZM_WEB_USER:$ZM_WEB_GROUP $pidfile
|
|
#Make sure the folder for the socks file exists or create one
|
|
@@ -56,7 +55,6 @@ start()
|
|
|
|
stop()
|
|
{
|
|
- loadconf
|
|
echo -n $"Stopping $prog: "
|
|
$command stop
|
|
RETVAL=$?
|
|
@@ -67,22 +65,21 @@ stop()
|
|
|
|
zmstatus()
|
|
{
|
|
- loadconf
|
|
result=`$command status`
|
|
if [ "$result" = "running" ]; then
|
|
- echo "ZoneMinder is running"
|
|
+ echo "$prog is running"
|
|
$ZM_PATH_BIN/zmu -l
|
|
RETVAL=0
|
|
else
|
|
- echo "ZoneMinder is stopped"
|
|
+ echo "$prog is stopped"
|
|
RETVAL=1
|
|
fi
|
|
}
|
|
|
|
zmupdate()
|
|
{
|
|
- if [ -x $ZM_PATH_BIN/zm_update ]; then
|
|
- $ZM_PATH_BIN/zm_update noi
|
|
+ if [ -x $ZM_PATH_BIN/zmupdate.pl ]; then
|
|
+ $ZM_PATH_BIN/zmupdate.pl --freshen >/dev/null
|
|
fi
|
|
}
|
|
|
|
@@ -99,7 +96,6 @@ case "$1" in
|
|
start
|
|
;;
|
|
'condrestart')
|
|
- loadconf
|
|
result=`$ZM_PATH_BIN/zmdc.pl check`
|
|
if [ "$result" = "running" ]; then
|
|
$ZM_PATH_BIN/zmdc.pl shutdown > /dev/null
|
|
--- ./scripts/zmupdate.pl.in.dbinstall 2009-06-30 02:42:12.000000000 -0500
|
|
+++ ./scripts/zmupdate.pl.in 2009-07-19 22:27:02.000000000 -0500
|
|
@@ -403,7 +403,7 @@ if ( $version )
|
|
$command .= " -p".$db_pass;
|
|
}
|
|
}
|
|
- $command .= " ".ZM_DB_NAME." < ".ZM_PATH_BUILD."/db/zm_update-".$version.".sql";
|
|
+ $command .= " ".ZM_DB_NAME." < ".ZM_PATH_DATA."/db/zm_update-".$version.".sql";
|
|
|
|
print( "Executing '$command'\n" ) if ( DBG_LEVEL > 0 );
|
|
my $output = qx($command);
|
|
diff -up ./zm.conf.in.dbinstall ./zm.conf.in
|
|
--- ./zm.conf.in.dbinstall 2009-03-20 07:07:10.000000000 -0500
|
|
+++ ./zm.conf.in 2009-07-19 22:27:02.000000000 -0500
|
|
@@ -12,8 +12,8 @@
|
|
# Current version of ZoneMinder
|
|
ZM_VERSION=@VERSION@
|
|
|
|
-# Path to build directory, used mostly for finding DB upgrade scripts
|
|
-ZM_PATH_BUILD=@PATH_BUILD@
|
|
+# Path to installed data directory, used mostly for finding DB upgrade scripts
|
|
+ZM_PATH_DATA=@PKGDATADIR@
|
|
|
|
# Build time, used to record when to trigger various checks
|
|
ZM_TIME_BUILD=@TIME_BUILD@
|