pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Don't use the same inclusion guard as fam/buildlink...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c43a38561f7b
branches:  trunk
changeset: 498093:c43a38561f7b
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Aug 12 15:33:15 2005 +0000

description:
Don't use the same inclusion guard as fam/buildlink3.mk.  "Duh."

diffstat:

 mk/fam.buildlink3.mk |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r e5df51bb4edf -r c43a38561f7b mk/fam.buildlink3.mk
--- a/mk/fam.buildlink3.mk      Fri Aug 12 14:39:06 2005 +0000
+++ b/mk/fam.buildlink3.mk      Fri Aug 12 15:33:15 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fam.buildlink3.mk,v 1.1 2005/08/10 21:10:54 jlam Exp $
+# $NetBSD: fam.buildlink3.mk,v 1.2 2005/08/12 15:33:15 jlam Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a FAM implementation.  fam.buildlink3.mk will:
@@ -15,11 +15,11 @@
 # FAM_ACCEPTED is a package-settable list of FAM implementations that
 #      may be used by the package.
 
-FAM_BUILDLINK3_MK:=    ${FAM_BUILDLINK3_MK}+
+MK_FAM_BUILDLINK3_MK:= ${MK_FAM_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(FAM_BUILDLINK3_MK:M+)
+.if !empty(MK_FAM_BUILDLINK3_MK:M+)
 FAM_DEFAULT?=  fam
 FAM_ACCEPTED?= ${_FAM_PKGS}
 
@@ -42,7 +42,7 @@
 
 BUILD_DEFS+=   FAM_TYPE
 BUILD_DEFS+=   FAMBASE
-.endif # FAM_BUILDLINK3_MK
+.endif # MK_FAM_BUILDLINK3_MK
 
 .if ${FAM_TYPE} == "none"
 PKG_FAIL_REASON=       \



Home | Main Index | Thread Index | Old Index