From 642f20352706851cf7d1784ae72e5a3a1d7f4d10 Mon Sep 17 00:00:00 2001 From: jkim Date: Thu, 14 Nov 2013 18:43:25 +0000 Subject: 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 --- Mk/Uses/webplugin.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Mk/Uses') diff --git a/Mk/Uses/webplugin.mk b/Mk/Uses/webplugin.mk index e66abe0130ba..aec6c11b8797 100644 --- a/Mk/Uses/webplugin.mk +++ b/Mk/Uses/webplugin.mk @@ -166,14 +166,12 @@ WEBPLUGIN_DIR?= ${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGIN_N 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} -- cgit