svn commit: r359335 - in head: etc/mtree lib/kyua lib/kyua/cli usr.bin/kyua

[Brooks Davis]

Author: brooks
Date: Thu Mar 26 17:34:17 2020
New Revision: 359335
URL: https://svnweb.freebsd.org/changeset/base/359335

Log:
  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

Modified:
  head/etc/mtree/BSD.usr.dist
  head/lib/kyua/Makefile.kyua
  head/lib/kyua/cli/Makefile
  head/usr.bin/kyua/Makefile

Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist	Thu Mar 26 17:28:54 2020	(r359334)
+++ head/etc/mtree/BSD.usr.dist	Thu Mar 26 17:34:17 2020	(r359335)
@@ -219,6 +219,8 @@
             ..
             atf
             ..
+            kyua
+            ..
             legal
             ..
             llvm

Modified: head/lib/kyua/Makefile.kyua
==============================================================================
--- head/lib/kyua/Makefile.kyua	Thu Mar 26 17:28:54 2020	(r359334)
+++ head/lib/kyua/Makefile.kyua	Thu Mar 26 17:34:17 2020	(r359335)
@@ -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

Modified: head/lib/kyua/cli/Makefile
==============================================================================
--- head/lib/kyua/cli/Makefile	Thu Mar 26 17:28:54 2020	(r359334)
+++ head/lib/kyua/cli/Makefile	Thu Mar 26 17:34:17 2020	(r359335)
@@ -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\"				\

Modified: head/usr.bin/kyua/Makefile
==============================================================================
--- head/usr.bin/kyua/Makefile	Thu Mar 26 17:28:54 2020	(r359334)
+++ head/usr.bin/kyua/Makefile	Thu Mar 26 17:34:17 2020	(r359335)
@@ -28,10 +28,13 @@ 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}