3 files changed, 8 insertions, 8 deletions
diff --git a/x11/qwt/files/Makefile.apps b/x11/qwt/files/Makefile.apps
index 7112dcc0239..435b360defc 100644
--- a/x11/qwt/files/Makefile.apps
+++ b/x11/qwt/files/Makefile.apps
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.apps,v 1.2 2000/03/23 23:15:26 dmcmahill Exp $
+# $NetBSD: Makefile.apps,v 1.3 2000/03/28 00:09:23 dmcmahill Exp $
 #
 #	Makefile rules for Qwt examples
 #	===============================
@@ -15,7 +15,7 @@ CFLAGS	=	-O2
 INCLUDES =	-I$(QWTINC) -I$(QTINC)
 LD	=	$(CC)
 LDFLAGS	=	
-LIBS	=	-L$(QTLIB) -W,l -R$(QTLIB) -lqt1 -lXext -lX11 -lqwt -lm
+LIBS	=	-L$(X11BASE) -Wl,-R$(X11BASE) -L$(QTLIB) -Wl,-R$(QTLIB) -lqt -lXext -lX11 -lqwt -lm
 
 #
 # IMPLICIT RULES
diff --git a/x11/qwt/files/Makefile.common b/x11/qwt/files/Makefile.common
index 3496ba9478c..d0bf172edbf 100644
--- a/x11/qwt/files/Makefile.common
+++ b/x11/qwt/files/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.2 2000/03/23 23:15:26 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.3 2000/03/28 00:09:23 dmcmahill Exp $
 #
 # Paths for Qt headers and library
 #
 
-QTDIR=$(PREFIX)
-QTINC=$(QTDIR)/include/qt1
+QTDIR=$(X11BASE)/qt1
+QTINC=$(QTDIR)/include
 QTLIB=$(QTDIR)/lib
-MOC=$(QTDIR)/bin/moc1
+MOC=$(QTDIR)/bin/moc
 
 #
 # Paths for Qwt headers and library 
diff --git a/x11/qwt/files/Makefile.lib b/x11/qwt/files/Makefile.lib
index 1e31bc4481f..a09b755c787 100644
--- a/x11/qwt/files/Makefile.lib
+++ b/x11/qwt/files/Makefile.lib
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.lib,v 1.1.1.1 1999/11/17 18:32:29 drochner Exp $
+# $NetBSD: Makefile.lib,v 1.2 2000/03/28 00:09:23 dmcmahill Exp $
 #
 #	Makefile rules for the Qwt Library
 #	==================================
@@ -11,7 +11,7 @@ include $(QWTDIR)/Makefile.common
 #
 LCXX	=	$(LIBTOOL) --mode=compile $(CXX)
 INCLUDES =	-I../include -I$(QTINC)
-LLD	=	$(LIBTOOL) --mode=link $(CXX) -rpath $(PREFIX)/lib \
+LLD	=	$(LIBTOOL) --mode=link $(CXX) -rpath $(QTLIB) -rpath $(PREFIX)/lib -rpath ${X11BASE}/lib \
 		-version-info 0:2
 
 #