Skip to content

Commit

Permalink
configure.ac, scripts/augeas/Makefile.am: Define an auglenstestsdir
Browse files Browse the repository at this point in the history
… to install the augeas `test_nut.aug` file

Signed-off-by: Jim Klimov <[email protected]>
  • Loading branch information
jimklimov committed Jun 15, 2024
1 parent dc099e8 commit daea337
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
8 changes: 8 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand All @@ -3918,6 +3924,7 @@ else
AC_MSG_RESULT(no)
fi

dnl ----------------------------------------------------------------------

AC_MSG_CHECKING(whether to install hotplug rules)
AC_ARG_WITH(hotplug-dir,
Expand Down Expand Up @@ -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)

Expand Down
5 changes: 4 additions & 1 deletion scripts/augeas/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit daea337

Please sign in to comment.