diff options
| author | grant <grant> | 2003-10-06 08:50:40 +0000 |
|---|---|---|
| committer | grant <grant> | 2003-10-06 08:50:40 +0000 |
| commit | c38e4a1dbba3b7bb4429d680bfafb5281fc97b2b (patch) | |
| tree | 26f685159c535d96751312c2fa9b554305c49ff2 | |
| parent | 931063e82e6640b4c860c7660f2f35cdc776ef75 (diff) | |
| download | pkgsrc-c38e4a1dbba3b7bb4429d680bfafb5281fc97b2b.tar.gz | |
fix handling of DISTDIR. patch from Sebastian Prause on tech-pkg.
bump to 3.64.
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkglint/files/lintpkgsrc.pl | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 29b706ac101..d1357f68f2b 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.170 2003/10/01 11:56:17 abs Exp $ +# $NetBSD: Makefile,v 1.171 2003/10/06 08:50:40 grant Exp $ # -DISTNAME= pkglint-3.63 +DISTNAME= pkglint-3.64 WRKSRC= ${WRKDIR} CATEGORIES= pkgtools devel MASTER_SITES= # empty diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl index 3a681128b5a..cfc2c17eee4 100755 --- a/pkgtools/pkglint/files/lintpkgsrc.pl +++ b/pkgtools/pkglint/files/lintpkgsrc.pl @@ -1,6 +1,6 @@ #!@PREFIX@/bin/perl -# $NetBSD: lintpkgsrc.pl,v 1.84 2003/10/01 11:56:17 abs Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.85 2003/10/06 08:50:40 grant Exp $ # Written by David Brownlee <abs@netbsd.org>. # @@ -441,7 +441,8 @@ sub get_default_makefile_vars if ($opt{M}) { $default_vars->{DISTDIR} = $opt{M}; } - $default_vars->{DISTDIR} ||= $default_vars->{PKGSRCDIR}.'/distfiles'; + else + { $default_vars->{DISTDIR} ||= $default_vars->{PKGSRCDIR}.'/distfiles'; } if ($opt{K}) { $default_vars->{PACKAGES} = $opt{K}; } |