[#1987] fix Makefile error about check-hashes.sh

diff --git a/configure.ac b/configure.ac
index ae99e57c4ef1ed7d88e880509a125128a06f7763..9865e65dc32a604d815539a7e0d677567496d74b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1948,6 +1948,7 @@ AC_CONFIG_FILES([src/share/database/scripts/pgsql/wipe_data.sh],
                 [chmod +x src/share/database/scripts/pgsql/wipe_data.sh])
 AC_CONFIG_FILES([src/share/yang/Makefile])
 AC_CONFIG_FILES([src/share/yang/modules/Makefile])
+AC_CONFIG_FILES([src/share/yang/modules/utils/Makefile])
 AC_CONFIG_FILES([tools/Makefile])
 AC_CONFIG_FILES([tools/path_replacer.sh],
                 [chmod +x tools/path_replacer.sh])

diff --git a/src/share/yang/modules/Makefile.am b/src/share/yang/modules/Makefile.am
index 4fcc6749357a4bc70c31dccab2bf7313733e6105..6c144dfc2de157a0e9f4a7f0ed9d1883b21ec369 100644 (file)
--- a/src/share/yang/modules/Makefile.am
+++ b/src/share/yang/modules/Makefile.am
@@ -1,22 +1,8 @@
-SUBDIRS = .
-
-# Shell tests
-SHTESTS = utils/check-hashes.sh
-
-# Run shell tests on "make check".
-check_SCRIPTS = $(SHTESTS)
-TESTS = $(SHTESTS)
-
-# As with every file generated by ./configure, clean them up when running
-# "make distclean", but not on "make clean".
-DISTCLEANFILES = $(SHTESTS)
-
-# Don't install tests.
-noinst_SCRIPTS = $(SHTESTS)
+SUBDIRS = utils
 
 yangmodulesdir = ${datarootdir}/${PACKAGE_NAME}/yang/modules
 
-yangmodules_list = ietf-dhcpv6-client@2018-09-04.yang
+yangmodules_list  = ietf-dhcpv6-client@2018-09-04.yang
 yangmodules_list += ietf-interfaces@2018-02-20.yang
 yangmodules_list += ietf-dhcpv6-options@2018-09-04.yang
 yangmodules_list += ietf-dhcpv6-relay@2018-09-04.yang
@@ -32,8 +18,8 @@ yangmodules_list += kea-dhcp6-server@2019-08-12.yang
 yangmodules_list += kea-types@2019-08-12.yang
 yangmodules_list += keatest-module@2018-11-20.yang
 
+EXTRA_DIST = ${yangmodules_list}
+
 if HAVE_SYSREPO
-yangmodules_DATA  = ${yangmodules_list}
+yangmodules_DATA = ${yangmodules_list}
 endif
-
-EXTRA_DIST = ${yangmodules_list}

diff --git a/src/share/yang/modules/utils/Makefile.am b/src/share/yang/modules/utils/Makefile.am
new file mode 100644 (file)
index 0000000..bfe7927
--- /dev/null
+++ b/src/share/yang/modules/utils/Makefile.am
@@ -0,0 +1,18 @@
+SUBDIRS = .
+
+if HAVE_SYSREPO
+
+# Shell tests
+SHTESTS = check-hashes.sh
+
+# Run shell tests on "make check".
+check_SCRIPTS = $(SHTESTS)
+TESTS = $(SHTESTS)
+
+# Don't install tests.
+noinst_SCRIPTS = $(SHTESTS)
+
+# Add to the tarball:
+EXTRA_DIST = $(SHTESTS)
+
+endif