svn commit: r359385 - head/usr.bin/kyua

Enji Cooper ngie at FreeBSD.org
Sat Mar 28 01:08:31 UTC 2020


Author: ngie
Date: Sat Mar 28 01:08:20 2020
New Revision: 359385
URL: https://svnweb.freebsd.org/changeset/base/359385

Log:
  Check in the generated copies of the manpages
  
  These manpages were meant to be templated once per `configure` run.
  
  Given that we're not bound by as many constants, e.g., `--prefix` isn't
  generally changing for kyua in the base system, having to generate the
  manpages each build seems slightly less than optimal.
  
  In the event that one's build environment doesn't define `$SH`, the build
  will also fail until this change is introduced.
  
  Instead of jumping through hoops dealing with shells or permissions, let's
  just cut to the chase and check the generated copies into the sourcebase
  under usr.bin/kyua .
  
  MFC with:	r359260
  Reported by:	Julian Stacey <jhs at berklix.com>

Modified:
  head/usr.bin/kyua/Makefile

Modified: head/usr.bin/kyua/Makefile
==============================================================================
--- head/usr.bin/kyua/Makefile	Sat Mar 28 00:41:47 2020	(r359384)
+++ head/usr.bin/kyua/Makefile	Sat Mar 28 01:08:20 2020	(r359385)
@@ -2,7 +2,7 @@
 
 .include "${SRCTOP}/lib/kyua/Makefile.kyua"
 
-.PATH: ${KYUA_SRCDIR}
+.PATH: ${.CURDIR} ${.OBJDIR} ${KYUA_SRCDIR}
 
 PROG_CXX=	kyua
 SRCS=		main.cpp
@@ -48,20 +48,6 @@ STORE=		migrate_v1_v2.sql migrate_v2_v3.sql schema_v3.
 STOREDIR=	${KYUA_STOREDIR}
 .PATH:		${KYUA_SRCDIR}/store
 
-CLEANFILES+=	${MAN}
 .PATH: ${KYUA_SRCDIR}/doc
-.for man in ${MAN}
-${man}: ${man}.in
-	${SH} ${KYUA_SRCDIR}/doc/manbuild.sh \
-	    -v "CONFDIR=${KYUA_CONFDIR}" \
-	    -v "DOCDIR=${KYUA_DOCDIR}" \
-	    -v "EGDIR=${KYUA_EGDIR}" \
-	    -v "MISCDIR=${KYUA_MISCDIR}" \
-	    -v "PACKAGE=kyua" \
-	    -v "STOREDIR=${KYUA_STOREDIR}" \
-	    -v "TESTSDIR=${TESTSBASE}" \
-	    -v "VERSION=${KYUA_VERSION}" \
-	    ${.ALLSRC} ${.TARGET}
-.endfor
 
 .include <bsd.prog.mk>


More information about the svn-src-all mailing list