58 lines
2 KiB
Diff
58 lines
2 KiB
Diff
diff -up ./configure.ac.dbinstall ./configure.ac
|
|
--- ./configure.ac.dbinstall 2011-08-23 10:10:32.000000000 -0500
|
|
+++ ./configure.ac 2012-01-19 12:52:29.201006160 -0600
|
|
@@ -1,10 +1,10 @@
|
|
AC_PREREQ(2.59)
|
|
-AC_INIT(zm,1.25.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],ZoneMinder,http://www.zoneminder.com/downloads.html)
|
|
+AC_INIT(zm,1.25.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
|
|
AM_INIT_AUTOMAKE
|
|
AC_CONFIG_SRCDIR(src/zm.h)
|
|
AM_CONFIG_HEADER(config.h)
|
|
|
|
-PATH_BUILD=`pwd`
|
|
+PATH_BUILD=/usr/share/zoneminder
|
|
AC_SUBST(PATH_BUILD)
|
|
TIME_BUILD=`date +'%s'`
|
|
AC_SUBST(TIME_BUILD)
|
|
@@ -358,6 +358,8 @@ 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(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 2011-06-21 02:40:11.000000000 -0500
|
|
+++ ./db/Makefile.am 2012-01-19 12:15:03.871582792 -0600
|
|
@@ -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 ./zm.conf.in.dbinstall ./zm.conf.in
|
|
--- ./zm.conf.in.dbinstall 2008-07-25 04:48:17.000000000 -0500
|
|
+++ ./zm.conf.in 2012-01-19 12:15:03.872582761 -0600
|
|
@@ -15,6 +15,9 @@ 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@
|
|
|