From f81af31347633e8aeb0f918644380032544bbff6 Mon Sep 17 00:00:00 2001 From: brooks Date: Thu, 26 Mar 2020 17:34:17 +0000 Subject: [PATCH] Install expected kyua docs. The "kyua about" command assumes these files exist causing tests supplied devel/kyua to fail. Fix a bug defining the default KYUA_DOCDIR so the installed files can be found. Reported by: jenkins tests Reviewed by: lwhsu Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D24187 --- etc/mtree/BSD.usr.dist | 2 ++ lib/kyua/Makefile.kyua | 2 +- lib/kyua/cli/Makefile | 2 +- usr.bin/kyua/Makefile | 5 ++++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 669a70dded3c..b4eeb936c2ae 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -219,6 +219,8 @@ .. atf .. + kyua + .. legal .. llvm diff --git a/lib/kyua/Makefile.kyua b/lib/kyua/Makefile.kyua index 0ed1bd855aa3..1fd30a135409 100644 --- a/lib/kyua/Makefile.kyua +++ b/lib/kyua/Makefile.kyua @@ -3,7 +3,7 @@ KYUA_VERSION= 0.13 KYUA_CONFDIR= /etc/kyua -KYUA_DOCDIR= /nonexistant +KYUA_DOCDIR= /usr/share/doc/kyua KYUA_EGDIR= /usr/share/examples/kyua KYUA_MISCDIR= /usr/share/kyua/misc KYUA_STOREDIR= /usr/share/kyua/store diff --git a/lib/kyua/cli/Makefile b/lib/kyua/cli/Makefile index 5caeab4d4749..b5de51607c12 100644 --- a/lib/kyua/cli/Makefile +++ b/lib/kyua/cli/Makefile @@ -4,7 +4,7 @@ KYUA_LIB= cli INTERNALLIB= LIBADD= kyua_drivers kyua_engine kyua_model kyua_store kyua_utils CFLAGS+= -DKYUA_CONFDIR=\"${KYUA_CONFDIR}\" \ - -DKYUA_DOCDIR=\"${KYUA_CONFDIR}\" \ + -DKYUA_DOCDIR=\"${KYUA_DOCDIR}\" \ -DKYUA_MISCDIR=\"${KYUA_MISCDIR}\" \ -DPACKAGE=\"kyua\" \ -DPACKAGE_NAME=\"Kyua\" \ diff --git a/usr.bin/kyua/Makefile b/usr.bin/kyua/Makefile index 0c4564041cb0..886aaa250906 100644 --- a/usr.bin/kyua/Makefile +++ b/usr.bin/kyua/Makefile @@ -28,11 +28,14 @@ CFLAGS+= -I${KYUA_SRCDIR} # kyua uses auto_ptr CFLAGS+= -Wno-deprecated-declarations -FILESGROUPS= EXAMPLES MISC STORE +FILESGROUPS= DOCS EXAMPLES MISC STORE CONFS= kyua.conf CONFSDIR= ${KYUA_CONFDIR} +DOCS= AUTHORS CONTRIBUTORS LICENSE +DOCSDIR= ${KYUA_DOCDIR} + EXAMPLES= Kyuafile.top kyua.conf EXAMPLESDIR= ${KYUA_EGDIR} .PATH: ${KYUA_SRCDIR}/examples