[#584,!338] Only install YANG and netconf files with --with-sysrepo

doc/Makefile.am
    Bracketed examples/netconf/*

src/bin/keactrl/Makefile.am
    Bracketed kea-netconf.conf and kea-netconf.conf.pre

src/share/Makefile.am
    Bracketed yang subdirectory

diff --git a/ChangeLog b/ChangeLog
index 09d22fc13af2a1472bad9090ba38a2938dcbf1a9..44e181284d5010f317d5e57c4baf8cb142144b64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1585.  [build]         tmark
+       Files related to YANG and netconf are now only installed
+       when the build is configured with --with-syspro.
+       (Gitlab #584,!338, git )
+
 1584.  [doc]           marcin
        Documented Kea Configuration Backend in the Kea Administrator
        Reference Manual.
@@ -14,7 +19,6 @@
        will now be trimmed of any trailing null bytes (0x0).
        (Gitlab #539, !330, git b126558e9e39e9bff517dceac25a00e96d150085)
 
-
 1581.  [bug]           marcin
        Corrected a bug whereby the DHCPv6 server did not take into
        account a relay address specified at the shared network level

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8c98c82405b0f5ae35903e37ee0d55d23c3e26a7..cd8858756ab3738454be501b1027deecb7d6c897 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -67,6 +67,8 @@ nobase_dist_doc_DATA += examples/kea6/simple.json
 nobase_dist_doc_DATA += examples/kea6/softwire46.json
 nobase_dist_doc_DATA += examples/kea6/stateless.json
 nobase_dist_doc_DATA += examples/kea6/with-ddns.json
+
+if HAVE_SYSREPO
 nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-config.xml
 nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-schema.xml
 nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-translator.xml
@@ -79,6 +81,7 @@ nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/twosubnets.xml
 nobase_dist_doc_DATA += examples/netconf/comments.json
 nobase_dist_doc_DATA += examples/netconf/simple-dhcp4.json
 nobase_dist_doc_DATA += examples/netconf/simple-dhcp6.json
+endif
 
 # These are files that document our APIs. They're not really needed as the
 # content is included in the api.xml, but may be useful for people who

diff --git a/src/bin/keactrl/Makefile.am b/src/bin/keactrl/Makefile.am
index 9851f58f5ecd9ddc09f066ee2ee9b48845a2d93f..55b597c2fcfe255a8345e403dc1067d5dda20483 100644 (file)
--- a/src/bin/keactrl/Makefile.am
+++ b/src/bin/keactrl/Makefile.am
@@ -6,7 +6,12 @@ SUBDIRS = . tests
 # setting KEACTRL_CONF environment variable.
 sbin_SCRIPTS  = keactrl
 KEA_CONFIGFILES = kea-dhcp4.conf kea-dhcp6.conf kea-dhcp-ddns.conf \
-                  kea-ctrl-agent.conf kea-netconf.conf
+                  kea-ctrl-agent.conf
+
+if HAVE_SYSREPO
+KEA_CONFIGFILES += kea-netconf.conf
+endif
+
 CONFIGFILES = keactrl.conf $(KEA_CONFIGFILES)
 
 man_MANS = keactrl.8
@@ -17,6 +22,10 @@ EXTRA_DIST = keactrl.in keactrl.conf.in kea-dhcp4.conf.pre \
              kea-ctrl-agent.conf.pre kea-netconf.conf.pre \
              $(man_MANS) keactrl.xml
 
+if HAVE_SYSREPO
+EXTRA_DIST += kea-netconf.conf.pre
+endif
+
 # *.conf files are not really sources used for building other targets, but we need
 # these files to be generated before make install is called.
 BUILT_SOURCES = $(KEA_CONFIGFILES)
@@ -51,9 +60,11 @@ kea-ctrl-agent.conf: kea-ctrl-agent.conf.pre
        $(top_builddir)/tools/path_replacer.sh \
     $(top_srcdir)/src/bin/keactrl/kea-ctrl-agent.conf.pre $@
 
+if HAVE_SYSREPO
 kea-netconf.conf: kea-netconf.conf.pre
        $(top_builddir)/tools/path_replacer.sh \
     $(top_srcdir)/src/bin/keactrl/kea-netconf.conf.pre $@
+endif
 
 if INSTALL_CONFIGURATIONS
 

diff --git a/src/share/Makefile.am b/src/share/Makefile.am
index 16d61613378023e0834546faa25c603b36dfa02e..a4672e9b73bb1551e2416059698382e64f1b1dd4 100644 (file)
--- a/src/share/Makefile.am
+++ b/src/share/Makefile.am
@@ -1 +1,6 @@
-SUBDIRS = database yang
+SUBDIRS = database
+
+if HAVE_SYSREPO
+SUBDIRS += yang
+endif
+