[3599] make distcheck fix

diff --git a/src/bin/admin/Makefile.am b/src/bin/admin/Makefile.am
index e5fb1f79e859cdb0aec368fd88997b6833e99484..e46c0eaa15340fc298f64b23ec97627bfc46e96e 100644 (file)
--- 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 b2d80ec94cb3db9af7caa6638f6c5a119e409af1..7c24017b70ad468e56dfdda39d179398fce0e200 100644 (file)
--- 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 6b43eb24349826ce370fb3fcdeaf0584ee041dd9..f148dfd61449df9f36c4753cf27fb175be5b2fc5 100644 (file)
--- 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