diff options
| author | asami <asami@FreeBSD.org> | 1995-08-29 11:24:50 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1995-08-29 11:24:50 +0000 |
| commit | 2c2d5b95af60f213c9fdb1c8278aef8dfdb6ee6b (patch) | |
| tree | fdfa473b9a01d8e9b363522da5351ff00f0d7d0f /share/mk | |
| parent | c80ab4eba41c46651a2745560373f22f3557b468 (diff) | |
| download | FreeBSD-src-2c2d5b95af60f213c9fdb1c8278aef8dfdb6ee6b.zip FreeBSD-src-2c2d5b95af60f213c9fdb1c8278aef8dfdb6ee6b.tar.gz | |
Clean up EXTRACT_ONLY logic a bit. Instead of branching in the
do-extract target depending on defined(EXTRACT_ONLY) or not, simply
set EXTRACT_ONLY ?= ${DISTFILES} and always use ${EXTRACT_ONLY} as
the extraction list.
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.port.mk | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk index 46994c4..b6b4167 100644 --- a/share/mk/bsd.port.mk +++ b/share/mk/bsd.port.mk @@ -3,7 +3,7 @@ # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. # -# $Id: bsd.port.mk,v 1.174 1995/07/24 08:02:07 asami Exp $ +# $Id: bsd.port.mk,v 1.175 1995/08/18 10:06:28 asami Exp $ # # Please view me with 4 column tabs! @@ -329,6 +329,10 @@ PATCHDIST:= ${DISTDIR} DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} PKGNAME?= ${DISTNAME} +# This is what is actually going to be extracted, and is overridable +# by user. +EXTRACT_ONLY?= ${DISTFILES} + # Documentation MAINTAINER?= ports@FreeBSD.ORG CATEGORIES?= orphans @@ -491,21 +495,12 @@ do-fetch: do-extract: @/bin/rm -rf ${WRKDIR} @/bin/mkdir -p ${WRKDIR} -.if defined(EXTRACT_ONLY) @for file in ${EXTRACT_ONLY}; do \ if ! (cd ${WRKDIR};${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\ then \ exit 1; \ fi \ done -.else - @for file in ${DISTFILES}; do \ - if ! (cd ${WRKDIR};${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\ - then \ - exit 1; \ - fi \ - done -.endif .endif # Patch |
