summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorjlam <jlam>2004-02-18 13:33:40 +0000
committerjlam <jlam>2004-02-18 13:33:40 +0000
commitc8a2fd90b73c914420e9b31021f269ee79cbfae1 (patch)
treee6391a0a29cee2898ed380fe3328cb0b69890ce3 /multimedia
parent920811ba4244705fdca01b1f2e99c9104cf6ec5f (diff)
downloadpkgsrc-c8a2fd90b73c914420e9b31021f269ee79cbfae1.tar.gz
Include "../../mk/compiler.mk" to get the value of CC_VERSION before
testing it.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/flashplayer/Makefile6
-rw-r--r--multimedia/kdemultimedia3/Makefile4
2 files changed, 6 insertions, 4 deletions
diff --git a/multimedia/flashplayer/Makefile b/multimedia/flashplayer/Makefile
index 3a451c48432..4e25096ae97 100644
--- a/multimedia/flashplayer/Makefile
+++ b/multimedia/flashplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/26 13:36:18 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/18 13:33:41 jlam Exp $
#
.include "../../multimedia/libflash/Makefile.common"
@@ -11,7 +11,9 @@ USE_BUILDLINK2= yes
BUILD_DIRS= ${WRKSRC}/Player
CPPFLAGS+= -DDEV_DSP=\\\"${DEVOSSSOUND}\\\"
-.if defined(CC_VERSION) && !empty(CC_VERSION:Mgcc-3.*)
+.include "../../mk/compiler.mk"
+
+.if !empty(CC_VERSION:Mgcc-3.*)
MAKE_ENV+= LIBSTDCPP=-lstdc++
.else
MAKE_ENV+= LIBSTDCPP=
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index e636097d2af..f2ea959863b 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/15 12:18:51 markd Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/18 13:33:41 jlam Exp $
DISTNAME= kdemultimedia-${_KDE_VERSION}
PKGREVISION= 1
@@ -16,7 +16,7 @@ USE_BUILDLINK2= YES
REPLACE_PERL= kscd/workman2cddb.pl
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/compiler.mk"
.if !empty(CC_VERSION:Mgcc-3.*)
BUILDLINK_DEPENDS.xine-lib= xine-lib>=1rc0anb1
.endif