diff options
| author | jlam <jlam> | 2002-08-25 18:38:05 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-25 18:38:05 +0000 |
| commit | b28e357f6ee52e603c887fc42483ea19558d4048 (patch) | |
| tree | d2b31bb9a6a069ebfb63079b9dddde1e6688bc4b /x11/qt3-libs/files | |
| parent | 4d330b06ae2802c2520909a77c9b2b5998f05140 (diff) | |
| download | pkgsrc-b28e357f6ee52e603c887fc42483ea19558d4048.tar.gz | |
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk. This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
Diffstat (limited to 'x11/qt3-libs/files')
| -rw-r--r-- | x11/qt3-libs/files/qmake.conf | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf index 0e0c274971d..edbd31989f1 100644 --- a/x11/qt3-libs/files/qmake.conf +++ b/x11/qt3-libs/files/qmake.conf @@ -1,5 +1,5 @@ -# -# $Id: qmake.conf,v 1.3 2002/05/30 12:33:27 skrll Exp $ +# $NetBSD: qmake.conf,v 1.4 2002/08/25 18:40:46 jlam Exp $ +# $Id: qmake.conf,v 1.4 2002/08/25 18:40:46 jlam Exp $ # # qmake configuration for netbsd-g++ # @@ -32,14 +32,14 @@ QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_INCDIR = @BUILDLINK_DIR@/include -QMAKE_LIBDIR = @BUILDLINK_DIR@/lib -QMAKE_INCDIR_X11 = @BUILDLINK_X11_DIR@/include -QMAKE_LIBDIR_X11 = @BUILDLINK_X11_DIR@/lib +QMAKE_INCDIR = @LOCALBASE@/include +QMAKE_LIBDIR = @LOCALBASE@/lib +QMAKE_INCDIR_X11 = @X11BASE@/include +QMAKE_LIBDIR_X11 = @X11BASE@/lib QMAKE_INCDIR_QT = $(QTDIR)/include QMAKE_LIBDIR_QT = $(QTDIR)/lib -QMAKE_INCDIR_OPENGL = @BUILDLINK_DIR@/include -QMAKE_LIBDIR_OPENGL = @BUILDLINK_DIR@/lib +QMAKE_INCDIR_OPENGL = @X11PREFIX@/include +QMAKE_LIBDIR_OPENGL = @X11PREFIX@/lib QMAKE_LINK = @LIBTOOL@ --mode=link @CXX@ QMAKE_LINK_SHLIB_CMD = \ |