diff options
| author | skrll <skrll> | 2001-03-05 12:47:12 +0000 |
|---|---|---|
| committer | skrll <skrll> | 2001-03-05 12:47:12 +0000 |
| commit | f7149be5119b6367158cc0374f0ee88dbd1c8543 (patch) | |
| tree | ee11b45fd08179ccc2be16a9036c8563ba678708 | |
| parent | 96d3639cff36e300afa171657b09049936915960 (diff) | |
| download | pkgsrc-f7149be5119b6367158cc0374f0ee88dbd1c8543.tar.gz | |
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.
| -rw-r--r-- | x11/qwt/Makefile | 4 | ||||
| -rw-r--r-- | x11/qwt/files/Makefile.lib | 5 |
2 files changed, 5 insertions, 4 deletions
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 |