diff options
| author | rillig <rillig@pkgsrc.org> | 2005-08-15 12:57:07 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-08-15 12:57:07 +0000 |
| commit | 4b77b8d4ae03acb1b9d92d7d3e3a818a93f9aa1a (patch) | |
| tree | 16d97be07a7695e9bab6fa0df4beeb7f45a7501c | |
| parent | 68d8241635840869ef51b692fefdf6cd64a3c697 (diff) | |
| download | pkgsrc-4b77b8d4ae03acb1b9d92d7d3e3a818a93f9aa1a.tar.gz | |
Reordered the conditions of checking for .tar files in DISTFILES to improve
readability.
| -rw-r--r-- | mk/bsd.pkg.extract.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mk/bsd.pkg.extract.mk b/mk/bsd.pkg.extract.mk index d226d0f318e..0d1ef2871bf 100644 --- a/mk/bsd.pkg.extract.mk +++ b/mk/bsd.pkg.extract.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.extract.mk,v 1.10 2005/07/15 18:27:54 jlam Exp $ +# $NetBSD: bsd.pkg.extract.mk,v 1.11 2005/08/15 12:57:07 rillig Exp $ # # This Makefile fragment is included to bsd.pkg.mk and defines the # relevant variables and targets for the "extract" phase. @@ -49,11 +49,12 @@ _EXTRACT_SUFFIXES+= .zoo _EXTRACT_SUFFIXES+= .bin _EXTRACT_SUFFIXES+= .rar -.if !empty(EXTRACT_ONLY:M*.tar) || !empty(EXTRACT_ONLY:M*.tar.*) || \ - !empty(EXTRACT_SUFX:M*.tar) || !empty(EXTRACT_SUFX:M*.tar.*) || \ - !empty(EXTRACT_ONLY:M*.tbz) || !empty(EXTRACT_ONLY:M*.tgz) || \ - !empty(EXTRACT_SUFX:M*.tbz) || !empty(EXTRACT_SUFX:M*.tgz) || \ +.if !empty(EXTRACT_ONLY:M*.tar) || !empty(EXTRACT_SUFX:M*.tar) || \ + !empty(EXTRACT_ONLY:M*.tar.*) || !empty(EXTRACT_SUFX:M*.tar.*) || \ + !empty(EXTRACT_ONLY:M*.tbz) || !empty(EXTRACT_SUFX:M*.tbz) || \ + !empty(EXTRACT_ONLY:M*.tgz) || !empty(EXTRACT_SUFX:M*.tgz) || \ !empty(EXTRACT_ONLY:M*_tar.gz) || !empty(EXTRACT_SUFX:M*_tar.gz) + . if !empty(EXTRACT_USING:Mgtar) USE_TOOLS+= gtar . elif !empty(EXTRACT_USING:Mnbtar) |