From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 9 Dec 2014 19:49:58 +0000 (+0100)
Subject: [3599] make distcheck fix
X-Git-Tag: kea-eng-20141219~9^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b149824b5f1e117c17c6b48c81b9a199ce26f1f9;p=thirdparty%2Fkea.git

[3599] make distcheck fix
---

diff --git a/src/bin/admin/Makefile.am b/src/bin/admin/Makefile.am
index e5fb1f79e8..e46c0eaa15 100644
--- a/src/bin/admin/Makefile.am
+++ b/src/bin/admin/Makefile.am
@@ -5,7 +5,7 @@ sbin_SCRIPTS  = kea-admin
 
 man_MANS = kea-admin.8
 DISTCLEANFILES = $(man_MANS)
-EXTRA_DIST = $(man_MANS) admin-utils.sh
+EXTRA_DIST = $(man_MANS) kea-admin.xml admin-utils.sh
 
 if GENERATE_DOCS
 
@@ -20,6 +20,5 @@ $(man_MANS):
 
 endif
 
-install-exec-hook:
-	mkdir -p $(DESTDIR)${datarootdir}/${PACKAGE_NAME}/scripts
-	install admin-utils.sh $(DESTDIR)${datarootdir}/${PACKAGE_NAME}/scripts
+adminscriptsdir = ${datarootdir}/${PACKAGE_NAME}/scripts
+adminscripts_DATA = admin-utils.sh
diff --git a/src/bin/admin/scripts/mysql/Makefile.am b/src/bin/admin/scripts/mysql/Makefile.am
index b2d80ec94c..7c24017b70 100644
--- a/src/bin/admin/scripts/mysql/Makefile.am
+++ b/src/bin/admin/scripts/mysql/Makefile.am
@@ -1,9 +1,6 @@
 SUBDIRS = .
 
-EXTRA_DIST = dhcpdb_create.mysql upgrade_1.0_to_2.0.sh
+sqlscriptsdir = ${datarootdir}/${PACKAGE_NAME}/scripts/mysql
+sqlscripts_DATA = dhcpdb_create.mysql upgrade_1.0_to_2.0.sh
 
-install-data-hook:
-	mkdir -p $(DESTDIR)${datarootdir}/${PACKAGE_NAME}/scripts/mysql
-	for file in $(EXTRA_DIST); do \
-		cp $$file $(DESTDIR)${datarootdir}/${PACKAGE_NAME}/scripts/mysql; \
-	done
+EXTRA_DIST = dhcpdb_create.mysql upgrade_1.0_to_2.0.sh
diff --git a/src/bin/admin/scripts/pgsql/Makefile.am b/src/bin/admin/scripts/pgsql/Makefile.am
index 6b43eb2434..f148dfd614 100644
--- a/src/bin/admin/scripts/pgsql/Makefile.am
+++ b/src/bin/admin/scripts/pgsql/Makefile.am
@@ -1,11 +1,6 @@
 SUBDIRS = .
 
-EXTRA_DIST = dhcpdb_create.pgsql
-
-dist_pkgdata_DATA = $(EXTRA_DIR)
+sqlscriptsdir = ${datarootdir}/${PACKAGE_NAME}/scripts/pgsql
+sqlscripts_DATA = dhcpdb_create.pgsql
 
-install-data-hook:
-	mkdir -p $(DESTDIR)${datarootdir}/${PACKAGE_NAME}/scripts/pgsql
-	for file in $(EXTRA_DIST); do \
-		cp $$file $(DESTDIR)${datarootdir}/${PACKAGE_NAME}/scripts/pgsql; \
-	done
+EXTRA_DIST = dhcpdb_create.pgsql