summaryrefslogtreecommitdiff
path: root/mk/bsd.pkg.mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2003-01-28 22:03:00 +0000
committerjlam <jlam@pkgsrc.org>2003-01-28 22:03:00 +0000
commitd7f69e47ce32be7271733bcdf48d28468f400ab9 (patch)
treed3bbe0e3f34c0d0b96c3bf5abf2964293c181c7b /mk/bsd.pkg.mk
parent63fd8d49cc206089921ed7d972b87faff07efbe6 (diff)
downloadpkgsrc-d7f69e47ce32be7271733bcdf48d28468f400ab9.tar.gz
Instead of including bsd.pkg.install.mk directly in a package Makefile,
have it be automatically included by bsd.pkg.mk if USE_PKGINSTALL is set to "YES". This enforces the requirement that bsd.pkg.install.mk be included at the end of a package Makefile. Idea suggested by Julio M. Merino Vidal <jmmv at menta.net>.
Diffstat (limited to 'mk/bsd.pkg.mk')
-rw-r--r--mk/bsd.pkg.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 7abb1228f48..fe9828fbbb4 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1132 2003/01/21 22:48:57 grant Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1133 2003/01/28 22:03:46 jlam Exp $
#
# This file is in the public domain.
#
@@ -941,6 +941,10 @@ NO_BUILDLINK= # defined
. include "../../mk/buildlink2/bsd.buildlink2.mk"
.endif
+.if defined(USE_PKGINSTALL) && !empty(USE_PKGINSTALL:M[yY][eE][sS])
+. include "../../mk/bsd.pkg.install.mk"
+.endif
+
.MAIN: all
# Use aliases, so that all versions of English are acceptable