Date: Tue, 12 Nov 2013 18:01:39 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333595 - head/Mk/Uses Message-ID: <201311121801.rACI1dSn046494@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Nov 12 18:01:39 2013 New Revision: 333595 URL: http://svnweb.freebsd.org/changeset/ports/333595 Log: Fix when PREFIX != LOCALBASE Reported by: avilla Modified: head/Mk/Uses/webplugin.mk Modified: head/Mk/Uses/webplugin.mk ============================================================================== --- head/Mk/Uses/webplugin.mk Tue Nov 12 17:58:00 2013 (r333594) +++ head/Mk/Uses/webplugin.mk Tue Nov 12 18:01:39 2013 (r333595) @@ -167,20 +167,19 @@ WEBPLUGIN_DIR?= ${_WEBPLUGIN_LIBDIR:S,^ PLIST_SUB+= WEBPLUGIN_DIR="${WEBPLUGIN_DIR:S,^${PREFIX}/,,}" _LNWF= ${WEBPLUGIN_FILES:S,^,${WEBPLUGIN_DIR}/,} -.for f in ${WEBPLUGIN_FILES} -PLIST_FILES+= ${_WEBPLUGIN_LINKFARMS:S,${LOCALBASE}/,,:C,(.*),\1/${f},} -.endfor -PLIST_DIRSTRY+= ${_WEBPLUGIN_SLDIRS:S,^${LOCALBASE}/,,} \ - ${_WEBPLUGIN_SLDIR:S,^${LOCALBASE}/,,} \ - ${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,,} 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}/ + @${ECHO_CMD} "${d:S,^${LOCALBASE}/,,}/${l:T}" >> ${TMPPLIST} .endfor + @${ECHO_CMD} "@unexec rmdir ${d:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST} .endfor + @${ECHO_CMD} "@unexec rmdir ${_WEBPLUGIN_SLDIR:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec rmdir ${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST} post-install: webplugin-post-install
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311121801.rACI1dSn046494>