pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Protect against multiple inclusion. This fixes the ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc5f684c214b
branches:  trunk
changeset: 534632:fc5f684c214b
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Oct 28 11:29:06 2007 +0000

description:
Protect against multiple inclusion. This fixes the "sane-frontends"
package which includes "bsd.options.mk" via its own "options.mk" and
via "graphics/gimp/buildlink3.mk".

diffstat:

 mk/bsd.options.mk |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r 11e169fb69ba -r fc5f684c214b mk/bsd.options.mk
--- a/mk/bsd.options.mk Sun Oct 28 11:07:47 2007 +0000
+++ b/mk/bsd.options.mk Sun Oct 28 11:29:06 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.options.mk,v 1.64 2007/10/13 11:04:16 dsl Exp $
+# $NetBSD: bsd.options.mk,v 1.65 2007/10/28 11:29:06 tron Exp $
 #
 # This Makefile fragment provides boilerplate code for standard naming
 # conventions for handling per-package build options.
@@ -86,6 +86,9 @@
 #              filtered to remove unsupported and duplicate options.
 #
 
+.if !defined(BSD_OPTIONS_MK)
+BSD_OPTIONS_MK=                # defined
+
 # To add options support to a package, here is an example for an
 # options.mk file. This file should be included by the package Makefile
 # or Makefile.common.
@@ -434,3 +437,5 @@
        @${ECHO} "=========================================================================="
 .  endif
 .endif
+
+.endif # BSD_OPTIONS_MK



Home | Main Index | Thread Index | Old Index