diff options
| author | rillig <rillig@pkgsrc.org> | 2022-08-19 18:23:41 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2022-08-19 18:23:41 +0000 |
| commit | 559d6d7678cb95a2af7e3a351d7a19922c61c5e3 (patch) | |
| tree | c972868a63817b8411fb4fa8c1d825fc650ee672 /pkgtools/lintpkgsrc | |
| parent | e87887648f27e3faceef65db2c18500bcf3b9ab8 (diff) | |
| download | pkgsrc-559d6d7678cb95a2af7e3a351d7a19922c61c5e3.tar.gz | |
lintpkgsrc: fix location of mk.conf
The effective location of mk.conf is not stored in a variable, and there
are several locations where it could be. Noticed by adam@.
Diffstat (limited to 'pkgtools/lintpkgsrc')
| -rw-r--r-- | pkgtools/lintpkgsrc/Makefile | 20 | ||||
| -rwxr-xr-x | pkgtools/lintpkgsrc/files/lintpkgsrc.pl | 4 |
2 files changed, 20 insertions, 4 deletions
diff --git a/pkgtools/lintpkgsrc/Makefile b/pkgtools/lintpkgsrc/Makefile index 0f96fa16102..2ebd4dc93ba 100644 --- a/pkgtools/lintpkgsrc/Makefile +++ b/pkgtools/lintpkgsrc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2022/08/14 13:13:52 rillig Exp $ +# $NetBSD: Makefile,v 1.54 2022/08/19 18:23:41 rillig Exp $ PKGNAME= lintpkgsrc-2022.08.13 CATEGORIES= pkgtools @@ -18,11 +18,27 @@ WRKSRC= ${WRKDIR} USE_LANGUAGES= # none AUTO_MKDIRS= yes +.include "../../mk/bsd.prefs.mk" + +# See bootstrap/bootstrap. +# See pkgtools/bootstrap-mk-files/files/bsd.own.mk.in. +# Another guess would be '${.MAKE.MAKEFILES:M*/mk.conf:[1]}'. +.for conf in \ + ${MAKECONF} \ + ${PKG_SYSCONFBASE:=/mk.conf} \ + ${SYSCONFBASE:=/mk.conf} \ + ${LOCALBASE:=/etc/mk.conf} +. if exists(${conf}) +LINTPKGSRC_MAKECONF= ${conf} +. endif +.endfor +LINTPKGSRC_MAKECONF?= /etc/mk.conf + SUBST_CLASSES+= lp SUBST_STAGE.lp= post-configure SUBST_FILES.lp+= lintpkgsrc.1 lintpkgsrc.pl +SUBST_VARS.lp+= LINTPKGSRC_MAKECONF SUBST_VARS.lp+= MAKE -SUBST_VARS.lp+= MAKECONF SUBST_VARS.lp+= PERL5 SUBST_VARS.lp+= PKGSRCDIR SUBST_VARS.lp+= PKG_INFO diff --git a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl index 73e4afe1ece..6df3075db12 100755 --- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl +++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl @@ -1,5 +1,5 @@ #!@PERL5@ -# $NetBSD: lintpkgsrc.pl,v 1.127 2022/08/19 05:20:27 rillig Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.128 2022/08/19 18:23:41 rillig Exp $ # Written by David Brownlee <abs@netbsd.org>. # @@ -185,7 +185,7 @@ package main; # Buildtime configuration my $conf_make = '@MAKE@'; -my $conf_makeconf = '@MAKECONF@'; +my $conf_makeconf = '@LINTPKGSRC_MAKECONF@'; my $conf_pkg_info = '@PKG_INFO@'; my $conf_pkgsrcdir = '@PKGSRCDIR@'; my $conf_prefix = '@PREFIX@'; |