diff options
| author | jlam <jlam> | 2004-08-27 18:44:11 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-08-27 18:44:11 +0000 |
| commit | 6a73d282edea2c9d122d0644621a4fc7b9fec1cc (patch) | |
| tree | e7485ab4140da3550db1e3642ad6f89e89486ded /x11 | |
| parent | 7d2e17512bd4c1f2ed563b5642565fb74e2d791b (diff) | |
| download | pkgsrc-6a73d282edea2c9d122d0644621a4fc7b9fec1cc.tar.gz | |
Change to use COMPILER_RPATH_FLAG.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt3-libs/Makefile.common | 5 | ||||
| -rw-r--r-- | x11/qt3-libs/files/qmake.conf | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index 20ade96a75a..ddcafd04b1a 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.33 2004/08/11 14:18:12 markd Exp $ +# $NetBSD: Makefile.common,v 1.34 2004/08/27 18:44:11 jlam Exp $ # DISTNAME= qt-x11-free-${QTVERSION} CATEGORIES= x11 @@ -96,8 +96,7 @@ post-patch: -e 's:@AR@:${AR}:g' \ -e 's:@LIBQT@:${LIBQT}:g' \ -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS}:g' \ - -e 's:@_COMPILER_LD_FLAG@:${_COMPILER_LD_FLAG}:g' \ - -e 's:@_OPSYS_RPATH_NAME@:${_OPSYS_RPATH_NAME}:g' \ + -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \ ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf for dir in ${WRKSRC}/mkspecs/*; do \ ${CP} ${WRKSRC}/qmake.conf $${dir}; \ diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf index 429ea03158b..11df1f83758 100644 --- a/x11/qt3-libs/files/qmake.conf +++ b/x11/qt3-libs/files/qmake.conf @@ -1,5 +1,5 @@ -# $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 $ +# $NetBSD: qmake.conf,v 1.15 2004/08/27 18:44:11 jlam Exp $ +# $Id: qmake.conf,v 1.15 2004/08/27 18:44:11 jlam Exp $ # # qmake configuration for netbsd-g++ # @@ -62,7 +62,7 @@ QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_SHLIB = QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -QMAKE_RPATH = @_COMPILER_LD_FLAG@@_OPSYS_RPATH_NAME@ +QMAKE_RPATH = @COMPILER_RPATH_FLAG@ QMAKE_RUN_CC = @LIBTOOL@ --mode=compile @CC@ -c $(CFLAGS) $(INCPATH) -o $obj $src QMAKE_RUN_CC_IMP = @LIBTOOL@ --mode=compile @CC@ -c $(CFLAGS) $(INCPATH) -o $@ $< |