Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Define an auglenstestsdir to install the augeas test_nut.aug file #2474

Merged
merged 1 commit into from
Jun 24, 2024
Merged

Define an auglenstestsdir to install the augeas test_nut.aug file #2474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions configure.ac
View file
Open in desktop
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
View file
Open in desktop
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
Loading