diff options
| author | joerg <joerg@pkgsrc.org> | 2015-07-04 16:18:28 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-07-04 16:18:28 +0000 |
| commit | 40359543350f97f6f4ce738f77467358da339880 (patch) | |
| tree | d8a48c8d2848b617581f63aeec6454f4736400cd /x11/qt4-libs | |
| parent | 87993e055fdcca0d2b61250e291a62eff0eb64ff (diff) | |
| download | pkgsrc-40359543350f97f6f4ce738f77467358da339880.tar.gz | |
Remove USE_X11BASE and X11PREFIX.
Diffstat (limited to 'x11/qt4-libs')
| -rw-r--r-- | x11/qt4-libs/Makefile.common | 3 | ||||
| -rw-r--r-- | x11/qt4-libs/files/qmake.conf | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common index 715fa528334..bbde0812122 100644 --- a/x11/qt4-libs/Makefile.common +++ b/x11/qt4-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.39 2015/05/27 21:36:02 wiz Exp $ +# $NetBSD: Makefile.common,v 1.40 2015/07/04 16:18:42 joerg Exp $ # used by x11/qt4-docs/Makefile # used by x11/qt4-libs/Makefile # used by x11/qt4-mng/Makefile @@ -143,7 +143,6 @@ CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline pre-configure: sed -e 's:@LOCALBASE@:${LOCALBASE}:g' \ -e 's:@X11BASE@:${X11BASE}:g' \ - -e 's:@X11PREFIX@:${X11PREFIX}:g' \ -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \ -e 's:@CC@:${CC:Q}:g' \ -e 's:@CXX@:${CXX:Q}:g' \ diff --git a/x11/qt4-libs/files/qmake.conf b/x11/qt4-libs/files/qmake.conf index f0624e40c0f..dbf29b36c4f 100644 --- a/x11/qt4-libs/files/qmake.conf +++ b/x11/qt4-libs/files/qmake.conf @@ -1,4 +1,4 @@ -# $NetBSD: qmake.conf,v 1.5 2011/01/12 07:07:07 adam Exp $ +# $NetBSD: qmake.conf,v 1.6 2015/07/04 16:18:42 joerg Exp $ # # qmake configuration for PkgSrc @@ -42,8 +42,8 @@ QMAKE_INCDIR_X11 = @X11BASE@/include QMAKE_LIBDIR_X11 = @X11BASE@/lib QMAKE_INCDIR_QT = $(QTDIR)/include QMAKE_LIBDIR_QT = $(QTDIR)/lib -QMAKE_INCDIR_OPENGL = @X11PREFIX@/include -QMAKE_LIBDIR_OPENGL = @X11PREFIX@/lib +QMAKE_INCDIR_OPENGL = @X11BASE@/include +QMAKE_LIBDIR_OPENGL = @X11BASE@/lib QMAKE_LINK = @CXX@ QMAKE_LINK_SHLIB = @CXX@ |