Date: Thu, 14 Nov 2013 18:43:25 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333783 - head/Mk/Uses Message-ID: <201311141843.rAEIhP9F040850@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Thu Nov 14 18:43:25 2013 New Revision: 333783 URL: http://svnweb.freebsd.org/changeset/ports/333783 Log: Fix symlink when PKGBASE, WEBPLUGIN_DIR, and WEBPLUGIN_NAME are not defined. The deeply nested expression for .for loop cannot be completely evaluated at the time of loop expansion because PKGBASE will be assigned much later. Approved by: bapt Modified: head/Mk/Uses/webplugin.mk Modified: head/Mk/Uses/webplugin.mk ============================================================================== --- head/Mk/Uses/webplugin.mk Thu Nov 14 18:30:39 2013 (r333782) +++ head/Mk/Uses/webplugin.mk Thu Nov 14 18:43:25 2013 (r333783) @@ -166,14 +166,12 @@ WEBPLUGIN_DIR?= ${_WEBPLUGIN_LIBDIR:S,^ PLIST_SUB+= WEBPLUGIN_DIR="${WEBPLUGIN_DIR:S,^${PREFIX}/,,}" -_LNWF= ${WEBPLUGIN_FILES:S,^,${WEBPLUGIN_DIR}/,} - webplugin-post-install: @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST} .for d in ${_WEBPLUGIN_LINKFARMS} ${INSTALL} -d ${STAGEDIR}${d} -.for l in ${_LNWF} - ${LN} -sf ${l} ${STAGEDIR}${d}/ +.for l in ${WEBPLUGIN_FILES} + ${LN} -sf ${l:S,^,${WEBPLUGIN_DIR}/,} ${STAGEDIR}${d}/ @${ECHO_CMD} "${d:S,^${LOCALBASE}/,,}/${l:T}" >> ${TMPPLIST} .endfor @${ECHO_CMD} "@unexec rmdir ${d:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311141843.rAEIhP9F040850>