diff options
| author | abs <abs@pkgsrc.org> | 2010-01-15 22:00:36 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2010-01-15 22:00:36 +0000 |
| commit | 4acd42293ce99d8b6a48cdefc4f87b4e72a1cd60 (patch) | |
| tree | c75df84266ca1e5785679f6b5ab90c803f6faa2a /pkgtools | |
| parent | 8b6b0cb5b384a2eaac263e39d5fd8da4cbcd24c0 (diff) | |
| download | pkgsrc-4acd42293ce99d8b6a48cdefc4f87b4e72a1cd60.tar.gz | |
Update bsd.files.mk multiple include protection to use the same mechanism
as in the base NetBSD system - fixes PR pkg/39715
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/bootstrap-mk-files/Makefile | 3 | ||||
| -rw-r--r-- | pkgtools/bootstrap-mk-files/files/bsd.files.mk | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgtools/bootstrap-mk-files/Makefile b/pkgtools/bootstrap-mk-files/Makefile index ee698ff5502..9bcea3448aa 100644 --- a/pkgtools/bootstrap-mk-files/Makefile +++ b/pkgtools/bootstrap-mk-files/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2009/08/07 07:48:59 dsainty Exp $ +# $NetBSD: Makefile,v 1.24 2010/01/15 22:00:36 abs Exp $ DISTNAME= bootstrap-mk-files-20090807 +PKGREVISION= 1 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/bootstrap-mk-files/files/bsd.files.mk b/pkgtools/bootstrap-mk-files/files/bsd.files.mk index 7bb266dc7d3..35a22fc28b3 100644 --- a/pkgtools/bootstrap-mk-files/files/bsd.files.mk +++ b/pkgtools/bootstrap-mk-files/files/bsd.files.mk @@ -1,7 +1,7 @@ -# $NetBSD: bsd.files.mk,v 1.1.1.1 2006/07/14 23:13:00 jlam Exp $ +# $NetBSD: bsd.files.mk,v 1.2 2010/01/15 22:00:36 abs Exp $ -# This file can be included multiple times. It clears the definition of -# FILES at the end so that this is possible. +.if !defined(_BSD_FILES_MK_) +_BSD_FILES_MK_=1 .PHONY: filesinstall realinstall: filesinstall @@ -37,4 +37,4 @@ ${DESTDIR}${FILESDIR_${F}:U${FILESDIR}}/${FILESNAME_${F}:U${FILESNAME:U${F:T}}}: filesinstall:: .endif -FILES:= +.endif # !defined(_BSD_FILES_MK_) |