summaryrefslogtreecommitdiff
path: root/x11/qt3-libs
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2004-07-31 22:23:40 +0000
committermarkd <markd@pkgsrc.org>2004-07-31 22:23:40 +0000
commit467956647117408118236029758fabf52a7a6f67 (patch)
tree7ca2d4c744463c5b0c3fd14de8be3d170bc66dd0 /x11/qt3-libs
parent5a559d5a2cdb11ecb6f5424e7c9f1c5336b97648 (diff)
downloadpkgsrc-467956647117408118236029758fabf52a7a6f67.tar.gz
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.
Diffstat (limited to 'x11/qt3-libs')
-rw-r--r--x11/qt3-libs/files/qmake.conf6
1 files changed, 3 insertions, 3 deletions
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 =