From 7d872eab35c203ea34ce418d4d80969bd29c586c Mon Sep 17 00:00:00 2001
From: skrll <skrll@pkgsrc.org>
Date: Mon, 5 Mar 2001 12:47:12 +0000
Subject: Pass the default c++ compiler in MAKE_ENV so that we don't confuse
 the new libtool.

While I'm here: pass only one -rpath option to libtool link so that the
install directory gets set correctly.
---
 x11/qwt/Makefile           | 4 +++-
 x11/qwt/files/Makefile.lib | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'x11/qwt')

diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index 12523f9f2e4..894694eb9cb 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/25 04:18:27 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2001/03/05 12:47:12 skrll Exp $
 
 DISTNAME=	qwtlib-0.2
 CATEGORIES=	x11
@@ -17,6 +17,8 @@ USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/qwt
 ALL_TARGET=	src
 
+MAKE_ENV+=	CXX=${CXX}
+
 do-configure:
 	${CP} ${FILESDIR}/Makefile.* ${WRKSRC}
 
diff --git a/x11/qwt/files/Makefile.lib b/x11/qwt/files/Makefile.lib
index a09b755c787..cd57be04301 100644
--- a/x11/qwt/files/Makefile.lib
+++ b/x11/qwt/files/Makefile.lib
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.lib,v 1.2 2000/03/28 00:09:23 dmcmahill Exp $
+# $NetBSD: Makefile.lib,v 1.3 2001/03/05 12:47:13 skrll Exp $
 #
 #	Makefile rules for the Qwt Library
 #	==================================
@@ -11,8 +11,7 @@ include $(QWTDIR)/Makefile.common
 #
 LCXX	=	$(LIBTOOL) --mode=compile $(CXX)
 INCLUDES =	-I../include -I$(QTINC)
-LLD	=	$(LIBTOOL) --mode=link $(CXX) -rpath $(QTLIB) -rpath $(PREFIX)/lib -rpath ${X11BASE}/lib \
-		-version-info 0:2
+LLD	=	$(LIBTOOL) --mode=link $(CXX) -rpath ${X11BASE}/lib -version-info 0:2
 
 #
 # IMPLICIT RULES
-- 
cgit v1.2.3