[pkgsrc/trunk]: pkgsrc/mk Proper include guards to unbreak nautilus. This was...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0ef403a6b2ce
branches:  trunk
changeset: 522047:0ef403a6b2ce
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Dec 01 13:05:53 2006 +0000

description:
Proper include guards to unbreak nautilus. This wasn't such a big
problem before, but the move to Xorg increased the including of this
file a lot.

diffstat:

 mk/x11.buildlink3.mk |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r d783c39c9a31 -r 0ef403a6b2ce mk/x11.buildlink3.mk
--- a/mk/x11.buildlink3.mk      Fri Dec 01 11:47:12 2006 +0000
+++ b/mk/x11.buildlink3.mk      Fri Dec 01 13:05:53 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: x11.buildlink3.mk,v 1.6 2006/11/17 09:50:54 rillig Exp $
+# $NetBSD: x11.buildlink3.mk,v 1.7 2006/12/01 13:05:53 joerg Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require an X11 distribution.  x11.buildlink3.mk will include the
@@ -7,7 +7,9 @@
 
 X11_BUILDLINK3_MK:=    ${X11_BUILDLINK3_MK}+
 
-.if ${X11_BUILDLINK3_MK} == "+"
+.if !defined(_X11_BUILDLINK3_MK)
+_X11_BUILDLINK3_MK=    1
+
 USE_X11=       yes
 
 .  include "../../mk/bsd.prefs.mk"
@@ -32,7 +34,7 @@
 
 X11_LDFLAGS+=  ${COMPILER_RPATH_FLAG}${X11BASE}/lib${LIBABISUFFIX}
 X11_LDFLAGS+=  -L${X11BASE}/lib${LIBABISUFFIX}
-.endif # X11_BUILDLINK3_MK
+.endif # _X11_BUILDLINK3_MK
 
 .include "${X11_PKGSRCDIR.${X11_TYPE}}/buildlink3.mk"