From daea33799b2a0a100d103146eac0ed5e281117e7 Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Wed, 3 Jan 2018 09:33:19 +0100 Subject: [PATCH] configure.ac, scripts/augeas/Makefile.am: Define an `auglenstestsdir` to install the augeas `test_nut.aug` file Signed-off-by: Jim Klimov --- configure.ac | 8 ++++++++ scripts/augeas/Makefile.am | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 414e26ba65..61865e2d0e 100644 --- a/configure.ac +++ b/configure.ac @@ -3909,6 +3909,12 @@ else fi AM_CONDITIONAL(WITH_AUGLENS, test -n "${auglensdir}") +if test -n "${auglensdir}"; then + auglenstestsdir="${auglensdir}/tests" +else + auglenstestsdir='' +fi + AC_PATH_PROGS([AUGPARSE], [augparse], [none]) AM_CONDITIONAL([HAVE_AUGPARSE], [test "x${AUGPARSE}" != "xnone"]) AC_MSG_CHECKING([whether to enable Augeas configuration-management lenses tests]) @@ -3918,6 +3924,7 @@ else AC_MSG_RESULT(no) fi +dnl ---------------------------------------------------------------------- AC_MSG_CHECKING(whether to install hotplug rules) AC_ARG_WITH(hotplug-dir, @@ -4426,6 +4433,7 @@ AC_SUBST(systemdsystemunitdir) AC_SUBST(systemdshutdowndir) AC_SUBST(systemdtmpfilesdir) AC_SUBST(auglensdir) +AC_SUBST(auglenstestsdir) AC_SUBST(hotplugdir) AC_SUBST(udevdir) diff --git a/scripts/augeas/Makefile.am b/scripts/augeas/Makefile.am index 583ccb7ddf..4537dfe60e 100644 --- a/scripts/augeas/Makefile.am +++ b/scripts/augeas/Makefile.am @@ -43,11 +43,14 @@ endif if WITH_AUGLENS # Now "make install" should cover delivery of Augeas lenses... -# The "auglensdir" value should be set up by configure +# The "auglensdir" and "auglenstestsdir" values should be set up by configure # The *.aug files are generated by rule above or by autogen.sh and/or configure auglens_DATA = \ nuthostsconf.aug nutupsconf.aug nutupsdusers.aug nutupsschedconf.aug \ nutnutconf.aug nutupsdconf.aug nutupsmonconf.aug nutupssetconf.aug + + auglenstests_DATA = \ + tests/test_nut.aug endif MAINTAINERCLEANFILES = Makefile.in .dirstamp