diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2005-05-22 01:37:31 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2005-05-22 01:37:31 +0000 |
| commit | 78adb68b24eae300ee857993f3ed6e85bdb86667 (patch) | |
| tree | e3d7679bbc1a1d9c8a76bb3ae584afd138bb5256 | |
| parent | 6806d580c923107cacfe452804b09449d8a23e80 (diff) | |
| download | pkgsrc-78adb68b24eae300ee857993f3ed6e85bdb86667.tar.gz | |
pass down FIND to genreadme.awk and binpkg-cache
| -rwxr-xr-x | mk/scripts/genreadme.awk | 6 | ||||
| -rwxr-xr-x | mk/scripts/mkreadme | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/mk/scripts/genreadme.awk b/mk/scripts/genreadme.awk index 0edd1a13131..567833f1fc5 100755 --- a/mk/scripts/genreadme.awk +++ b/mk/scripts/genreadme.awk @@ -1,5 +1,5 @@ #!/usr/bin/awk -f -# $NetBSD: genreadme.awk,v 1.18 2005/05/20 21:48:45 dmcmahill Exp $ +# $NetBSD: genreadme.awk,v 1.19 2005/05/22 01:37:31 dmcmahill Exp $ # # Copyright (c) 2002, 2003, 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -201,8 +201,8 @@ END { if ( builddependsfile == "" ) builddependsfile = "/dev/stdout"; printf("Making sure binary package cache file is up to date...\n"); - cmd = sprintf("%s AWK=%s CMP=%s GREP=%s PKG_INFO=\"%s\" PKG_SUFX=%s SED=%s SORT=%s %s/mk/scripts/binpkg-cache --packages %s", - SETENV, AWK, CMP, GREP, PKG_INFO, PKG_SUFX, SED, SORT, PKGSRCDIR, PACKAGES); + cmd = sprintf("%s AWK=%s CMP=%s FIND=%s GREP=%s PKG_INFO=\"%s\" PKG_SUFX=%s SED=%s SORT=%s %s/mk/scripts/binpkg-cache --packages %s", + SETENV, AWK, CMP, FIND, GREP, PKG_INFO, PKG_SUFX, SED, SORT, PKGSRCDIR, PACKAGES); if (debug) printf("\nExecute: %s\n",cmd); rc = system(cmd); diff --git a/mk/scripts/mkreadme b/mk/scripts/mkreadme index 091a8101126..19b9e5e00d4 100755 --- a/mk/scripts/mkreadme +++ b/mk/scripts/mkreadme @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: mkreadme,v 1.6 2005/05/18 04:51:35 dmcmahill Exp $ +# $NetBSD: mkreadme,v 1.7 2005/05/22 01:37:31 dmcmahill Exp $ # # Script for README.html generation # @@ -247,7 +247,7 @@ echo " " if [ -d ${PKGSRCDIR}/pkgtools/prereq-readme ]; then cd ${PKGSRCDIR}/pkgtools/prereq-readme eval "`${BMAKE} show-tools`" - for v in AWK CMP ECHO EXPR FGREP GREP SED SETENV SORT + for v in AWK CMP ECHO EXPR FGREP FIND GREP SED SETENV SORT do eval "echo '---->' ${v}=\"\${${v}}\"" done @@ -261,7 +261,7 @@ echo "Extracting configuration variables:" echo " " if [ -d ${PKGSRCDIR}/pkgtools/prereq-readme ]; then cd ${PKGSRCDIR}/pkgtools/prereq-readme - for v in CDROM_PKG_URL_HOST CDROM_PKG_URL_DIR CMP DISTDIR \ + for v in CDROM_PKG_URL_HOST CDROM_PKG_URL_DIR DISTDIR \ FTP_PKG_URL_HOST FTP_PKG_URL_DIR PACKAGES PKG_INFO PKG_SUFX do val=`${BMAKE} show-var VARNAME=${v}` @@ -389,6 +389,7 @@ ${AWK} -f ${PKGSRCDIR}/mk/scripts/genreadme.awk \ AWK=$AWK \ CMP=$CMP \ DISTDIR=$DISTDIR \ + FIND=$FIND \ GREP=$GREP \ PACKAGES=$PACKAGES \ PKG_INFO="$PKG_INFO" \ |