diff options
Diffstat (limited to 'x11/qt2-libs/Makefile.common')
| -rw-r--r-- | x11/qt2-libs/Makefile.common | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common index f63dab83efc..b4a2bf61323 100644 --- a/x11/qt2-libs/Makefile.common +++ b/x11/qt2-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.24 2005/10/04 19:34:36 joerg Exp $ +# $NetBSD: Makefile.common,v 1.25 2005/12/05 20:51:19 rillig Exp $ # DISTNAME= qt-x11-${QTVERSION} @@ -6,7 +6,7 @@ CATEGORIES= x11 MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/ -.include "../qt2/Makefile.common" +.include "../../x11/qt2/Makefile.common" WRKSRC= ${WRKDIR}/qt-${QTVERSION} HAS_CONFIGURE= yes @@ -22,12 +22,12 @@ CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance QTPREFIX= ${PREFIX}/qt2 -MAKE_ENV+= QTPREFIX=${QTPREFIX} +MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} -MAKE_ENV+= SYSCONF_CXXFLAGS="${CXXFLAGS}" -MAKE_ENV+= SYSCONF_CFLAGS="${CFLAGS}" -MAKE_ENV+= SYSCONF_CXXFLAGS_LIB="${CXXFLAGS}" -MAKE_ENV+= SYSCONF_CFLAGS_LIB="${CFLAGS}" +MAKE_ENV+= SYSCONF_CXXFLAGS=${CXXFLAGS:M*:Q} +MAKE_ENV+= SYSCONF_CFLAGS=${CFLAGS:M*:Q} +MAKE_ENV+= SYSCONF_CXXFLAGS_LIB=${CXXFLAGS:M*:Q} +MAKE_ENV+= SYSCONF_CFLAGS_LIB=${CFLAGS:M*:Q} DISTINFO_FILE= ${.CURDIR}/../../x11/qt2-libs/distinfo FILESDIR= ${.CURDIR}/../../x11/qt2-libs/files @@ -41,11 +41,11 @@ CONFIGURE_ARGS+= -platform solaris-g++ CONFIGURE_ARGS+= -xft -platform freebsd-g++ .endif -FILES_SUBST= BUILDLINK_DIR=${BUILDLINK_DIR} -FILES_SUBST+= BUILDLINK_X11_DIR=${BUILDLINK_X11_DIR} -FILES_SUBST+= LOCALBASE=${LOCALBASE} -FILES_SUBST+= QTDIR=${QTPREFIX} -FILES_SUBST+= X11BASE=${X11BASE} +FILES_SUBST= BUILDLINK_DIR=${BUILDLINK_DIR:Q} +FILES_SUBST+= BUILDLINK_X11_DIR=${BUILDLINK_X11_DIR:Q} +FILES_SUBST+= LOCALBASE=${LOCALBASE:Q} +FILES_SUBST+= QTDIR=${QTPREFIX:Q} +FILES_SUBST+= X11BASE=${X11BASE:Q} FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} .include "../../mk/x11.buildlink3.mk" |