From e04cc4d02680f5aa302f6ddf80ab636f0ffbd2b2 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@hotmail.com>
Date: Mon, 7 Oct 2013 08:26:29 -0500
Subject: [PATCH] Create pkgdatadir in make

---
 configure.ac   | 2 ++
 db/Makefile.am | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/configure.ac b/configure.ac
index c9935d6da..55e7c8a1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -378,6 +378,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC_MSG_WARN(X10::ActiveHome is required fo
 
 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 --git a/db/Makefile.am b/db/Makefile.am
index 040f77c46..b6da2b5d4 100644
--- a/db/Makefile.am
+++ b/db/Makefile.am
@@ -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 \