diff options
| author | adrianp <adrianp> | 2007-10-20 13:35:12 +0000 |
|---|---|---|
| committer | adrianp <adrianp> | 2007-10-20 13:35:12 +0000 |
| commit | 6a5434198424871c0fbb3836b691407d50477532 (patch) | |
| tree | a6e0f7b65ba33386ca8f33beab433bf2691bc6d8 /mk | |
| parent | 8e8dfc9e4809a1e48a9e33bfb9b32a5a13bdba89 (diff) | |
| download | pkgsrc-6a5434198424871c0fbb3836b691407d50477532.tar.gz | |
Rename PKGTOOLS_VER to PKGTOOLS_VERSION and use that everywhere
Export PKGTOOLS_VERSION so that genreadme.awk can use it
This will sync the output between './mkreadme' and 'make readme'
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.readme.mk | 4 | ||||
| -rwxr-xr-x | mk/scripts/genreadme.awk | 6 | ||||
| -rwxr-xr-x | mk/scripts/mkreadme | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/mk/bsd.pkg.readme.mk b/mk/bsd.pkg.readme.mk index 8c7ab0a8749..747aeb5464c 100644 --- a/mk/bsd.pkg.readme.mk +++ b/mk/bsd.pkg.readme.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.readme.mk,v 1.14 2007/10/09 19:19:12 martti Exp $ +# $NetBSD: bsd.pkg.readme.mk,v 1.15 2007/10/20 13:35:12 adrianp Exp $ # # This Makefile fragment is included by bsd.pkg.mk and encapsulates the # code to produce README.html files in each package directory. @@ -299,7 +299,7 @@ README.html: .PRECIOUS PKG_URL=${PKG_URL:Q} \ PKGSRCDIR=${.CURDIR:C|/[^/]*/[^/]*$||:Q} \ PVDIR=$$_PVDIR \ - PKGTOOLS_VER=${PKGTOOLS_VERSION} \ + PKGTOOLS_VERSION=${PKGTOOLS_VERSION} \ SED=${SED:Q} \ SETENV=${SETENV:Q} \ SORT=${SORT:Q} \ diff --git a/mk/scripts/genreadme.awk b/mk/scripts/genreadme.awk index 320afb5a35d..a4044bb5f0a 100755 --- a/mk/scripts/genreadme.awk +++ b/mk/scripts/genreadme.awk @@ -1,5 +1,5 @@ #!/usr/bin/awk -f -# $NetBSD: genreadme.awk,v 1.28 2007/08/29 23:26:30 adrianp Exp $ +# $NetBSD: genreadme.awk,v 1.29 2007/10/20 13:35:12 adrianp Exp $ # # Copyright (c) 2002, 2003, 2005, 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -380,7 +380,7 @@ END { # XXX: shown in the generated README.html files for packages. vul = ""; - if (have_vfile && PKGTOOLS_VER < 20070714) { + if (have_vfile && PKGTOOLS_VERSION < 20070714) { i = 1; pkgbase = pkgdir2name[toppkg]; gsub(/-[^-]*$/, "", pkgbase); @@ -410,7 +410,7 @@ END { } } - if (have_vfile && PKGTOOLS_VER >= 20070714) { + if (have_vfile && PKGTOOLS_VERSION >= 20070714) { pkg = pkgdir2name[toppkg]; if (debug) { diff --git a/mk/scripts/mkreadme b/mk/scripts/mkreadme index 6f043948a9f..9c426e3a6bf 100755 --- a/mk/scripts/mkreadme +++ b/mk/scripts/mkreadme @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: mkreadme,v 1.19 2007/10/09 19:19:13 martti Exp $ +# $NetBSD: mkreadme,v 1.20 2007/10/20 13:35:12 adrianp Exp $ # # Script for README.html generation # @@ -447,6 +447,7 @@ ${AWK} -f ${PKGSRCDIR}/mk/scripts/genreadme.awk \ PKG_SUFX=$PKG_SUFX \ PKG_URL=$PKG_URL \ PKGSRCDIR=$PKGSRCDIR \ + PKGTOOLS_VERSION=$PKGTOOLS_VERSION \ PVDIR=$PVDIR \ SED=$SED \ SETENV=$SETENV \ |