Date: Sun, 30 Dec 2012 17:41:44 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309682 - head/x11-toolkits/qt33 Message-ID: <201212301741.qBUHfiXL048772@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: crees Date: Sun Dec 30 17:41:43 2012 New Revision: 309682 URL: http://svnweb.freebsd.org/changeset/ports/309682 Log: Check realpath of PREFIX only when required Modified: head/x11-toolkits/qt33/Makefile Modified: head/x11-toolkits/qt33/Makefile ============================================================================== --- head/x11-toolkits/qt33/Makefile Sun Dec 30 16:50:29 2012 (r309681) +++ head/x11-toolkits/qt33/Makefile Sun Dec 30 17:41:43 2012 (r309682) @@ -77,10 +77,6 @@ PACKAGE_COOKIE= ${WRKDIR}/.package_done. .include <bsd.port.pre.mk> -.if exists(${PREFIX}) -PREFIX_REAL!= /bin/realpath ${PREFIX} -.endif - # The previous Qt port versions installed qmake and qmake's specs under LOCALBASE # The new devel/qmake port installs them under LOCALBASE. We can use # either one here, but we prefer the newer: @@ -197,8 +193,10 @@ post-build: @cd ${WRKSRC}/tools/${tool}; ${SETENV} ${MAKE_ENV} ${MAKE} .endfor @${RM} -f ${WRKSRC}/doc/html/qmake* - ${REINPLACE_CMD} -e 's|${PREFIX_REAL}/include/q.*h||g' \ - -e 's|${PREFIX_REAL}/include/private/q.*h||g' \ + + PREFIX_REAL=$$(/bin/realpath ${PREFIX}); \ + ${REINPLACE_CMD} -e "s|$${PREFIX_REAL}/include/q.*h||g" \ + -e "s|$${PREFIX_REAL}/include/private/q.*h||g" \ ${WRKSRC}/src/Makefile # Work around qmake generated dependencies
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212301741.qBUHfiXL048772>