From 8c7830b12f2909d1b110622b630a5b5f7fc9d7c0 Mon Sep 17 00:00:00 2001 From: markd Date: Sat, 31 Jul 2004 22:23:40 +0000 Subject: Set QMAKE_LFLAGS based on the value of LDFLAGS at the point that qmake is run rather than when the qmake.conf was generated. Should be effectively equivalent to what was happening under buildlink2 and fixes linking problems of audio/kmp and other qmake using packages. --- x11/qt3-libs/files/qmake.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'x11') diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf index 519574edf68..429ea03158b 100644 --- a/x11/qt3-libs/files/qmake.conf +++ b/x11/qt3-libs/files/qmake.conf @@ -1,5 +1,5 @@ -# $NetBSD: qmake.conf,v 1.13 2004/07/06 16:01:10 reed Exp $ -# $Id: qmake.conf,v 1.13 2004/07/06 16:01:10 reed Exp $ +# $NetBSD: qmake.conf,v 1.14 2004/07/31 22:23:40 markd Exp $ +# $Id: qmake.conf,v 1.14 2004/07/31 22:23:40 markd Exp $ # # qmake configuration for netbsd-g++ # @@ -56,7 +56,7 @@ QMAKE_LINK_SHLIB_CMD = \ -rpath $(if $(TARGET0), \ $(QTPREFIX)/lib, \ $(subst ../../..,$(QTPREFIX)/plugins,$(DESTDIR))) -QMAKE_LFLAGS = @LDFLAGS@ -L$(QTDIR)/lib +QMAKE_LFLAGS = $(LDFLAGS) -L$(QTDIR)/lib QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_SHLIB = -- cgit v1.2.3