Skip to content

Commit

Permalink
Install expected kyua docs.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
brooksdavis committed Mar 26, 2020
1 parent 6dce2be commit daa006f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
2 changes: 2 additions & 0 deletions etc/mtree/BSD.usr.dist
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,8 @@
..
atf
..
kyua
..
legal
..
llvm
Expand Down
2 changes: 1 addition & 1 deletion lib/kyua/Makefile.kyua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/kyua/cli/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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\" \
Expand Down
5 changes: 4 additions & 1 deletion usr.bin/kyua/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit daa006f

Please sign in to comment.