From 5264358eacd642e90b19a4fbb3cb0e92b59e98e5 Mon Sep 17 00:00:00 2001 From: schmonz Date: Tue, 26 Mar 2013 15:09:35 +0000 Subject: Subst paths for both test and install. In the configure stage, tell pkglint to find *.map in ${FILESDIR}. That lets tests run even when pkglint isn't installed (which means it also makes the tests less wrong when pkglint is installed!). In the install stage, tell pkglint to find *.map under ${PREFIX}, as before (no functional change to the installed package). Specify USE_TOOLS=perl to quell pkglint. :-) --- pkgtools/pkglint/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'pkgtools') diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 111e21a1185..49fe4d3ca17 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.425 2013/03/26 15:08:28 schmonz Exp $ +# $NetBSD: Makefile,v 1.426 2013/03/26 15:09:35 schmonz Exp $ # Note: if you update the version number, please have a look at the # changes between the CVS tag "pkglint_current" and HEAD. @@ -23,6 +23,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR} NO_CHECKSUM= yes USE_LANGUAGES= # none +USE_TOOLS+= perl AUTO_MKDIRS= yes .include "../../mk/bsd.prefs.mk" @@ -39,8 +40,12 @@ SUBST_SED.pkglint+= -e s\|@PREFIX@\|${PREFIX}\|g SUBST_SED.pkglint+= -e s\|@DISTVER@\|${DISTNAME:S/pkglint-//}\|g SUBST_SED.pkglint+= -e s\|@MAKE@\|${MAKE:Q}\|g SUBST_SED.pkglint+= -e s\|@PERL@\|${PERL5:Q}\|g -SUBST_SED.pkglint+= -e s\|@DATADIR@\|${PREFIX}/share/pkglint\|g -#SUBST_SED.pkglint+= -e s\|@DATADIR@\|/usr/pkgsrc/pkgtools/pkglint/files\|g +SUBST_SED.pkglint+= -e s\|@DATADIR@\|${FILESDIR}\|g + +SUBST_CLASSES+= mappaths +SUBST_STAGE.mappaths= pre-install +SUBST_FILES.mappaths+= pkglint.pl +SUBST_SED.mappaths+= -e s\|${FILESDIR}\|${PREFIX}/share/pkglint\|g # Note: This target is only intended for use by the pkglint author. .PHONY: quick-install -- cgit v1.2.3