diff options
| author | tv <tv@pkgsrc.org> | 2005-11-18 14:31:54 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-11-18 14:31:54 +0000 |
| commit | 323473ea47548e916d4e5111c8a2434b64018e92 (patch) | |
| tree | 0fb53126bd6c4dc6d24ad1edfc29fcda35cae964 /mk | |
| parent | cb50d0a5206dffb8d983659a5ad624a3f99bc906 (diff) | |
| download | pkgsrc-323473ea47548e916d4e5111c8a2434b64018e92.tar.gz | |
Simplify the _MASTER_SITE_{BACKUP,OVERRIDE} settings a bit by using a :D
construct rather than .if defined(), and changing := to =.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d0691b99dda..89be3599145 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1758 2005/11/17 19:30:22 erh Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1759 2005/11/18 14:31:54 tv Exp $ # # This file is in the public domain. # @@ -664,17 +664,8 @@ FETCH_BEFORE_ARGS += -p # Include popular master sites .include "../../mk/bsd.sites.mk" -.if defined(DIST_SUBDIR) -_MASTER_SITE_BACKUP:= ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}/} -. if defined(MASTER_SITE_OVERRIDE) -_MASTER_SITE_OVERRIDE:= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}/} -. endif # MASTER_SITE_OVERRIDE -.else # !DIST_SUBDIR -_MASTER_SITE_BACKUP:= ${MASTER_SITE_BACKUP} -. if defined(MASTER_SITE_OVERRIDE) -_MASTER_SITE_OVERRIDE:= ${MASTER_SITE_OVERRIDE} -. endif # MASTER_SITE_OVERRIDE -.endif # DIST_SUBDIR +_MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} +_MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} # Where to put distfiles that don't have any other master site MASTER_SITE_LOCAL?= ${MASTER_SITE_BACKUP:=LOCAL_PORTS/} |