diff options
| author | bapt <bapt@FreeBSD.org> | 2014-04-09 20:16:02 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-04-09 20:16:02 +0800 |
| commit | 9ffbe905318cc83dba8baf55404a079eaa6fc834 (patch) | |
| tree | 169d029b50977a77535a238de03a06b3591736fe /www | |
| parent | a4b955dd19c1a82b84459266742852ec5ba05e8f (diff) | |
| download | freebsd-ports-gnome-9ffbe905318cc83dba8baf55404a079eaa6fc834.tar.gz freebsd-ports-gnome-9ffbe905318cc83dba8baf55404a079eaa6fc834.tar.zst freebsd-ports-gnome-9ffbe905318cc83dba8baf55404a079eaa6fc834.zip | |
Fix stage support
Diffstat (limited to 'www')
| -rw-r--r-- | www/xpi-adblock/Makefile.xpi | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/www/xpi-adblock/Makefile.xpi b/www/xpi-adblock/Makefile.xpi index acd925e0979f..3571d7ba7015 100644 --- a/www/xpi-adblock/Makefile.xpi +++ b/www/xpi-adblock/Makefile.xpi @@ -138,19 +138,19 @@ XPI_SLDIRS_ALL= ${XPI_APPS_ALL:S.^.${XPI_SLDIR}/.} XPI_SLDIRS= ${USE_XPI:S.^.${XPI_SLDIR}/.} XPI_LINKFARMS= ${XPI_APPS} ${XPI_SLDIRS} -XPI_LIBDIR?= ${STAGEDIR}${PREFIX}/lib/xpi -XPI_SLDIR?= ${STAGEDIR}${XPI_LIBDIR}/symlinks +XPI_LIBDIR?= ${PREFIX}/lib/xpi +XPI_SLDIR?= ${XPI_LIBDIR}/symlinks .ifndef XPI_DISTNAMES XPI_XPIDIR?= ${XPI_LIBDIR}/${XPI_ID} .endif -XPI_DIRS_TRY= ${XPI_SLDIRS_ALL:S,^${STAGEDIR}${PREFIX}/,,} \ - ${XPI_SLDIR:S,^${STAGEDIR}${PREFIX}/,,} \ - ${XPI_LIBDIR:S,^${STAGEDIR}${PREFIX}/,,} +XPI_DIRS_TRY= ${XPI_SLDIRS_ALL:S,^${PREFIX}/,,} \ + ${XPI_SLDIR:S,^${PREFIX}/,,} \ + ${XPI_LIBDIR:S,^${PREFIX}/,,} -PLIST_SUB+= XPI_LIBDIR="${XPI_LIBDIR:S,^${STAGEDIR}${PREFIX}/,,}" \ - XPI_XPIDIR="${XPI_XPIDIR:S,^${STAGEDIR}${PREFIX}/,,}" +PLIST_SUB+= XPI_LIBDIR="${XPI_LIBDIR:S,^${PREFIX}/,,}" \ + XPI_XPIDIR="${XPI_XPIDIR:S,^${PREFIX}/,,}" -_TD= ${XPI_XPIDIR:S,^${STAGEDIR}${PREFIX}/,,} +_TD= ${XPI_XPIDIR:S,^${PREFIX}/,,} _TD_FULL= ${XPI_XPIDIR} _A= >> ${TMPPLIST} _Q= 2>/dev/null || true @@ -159,20 +159,19 @@ PLIST_DIRS+= ${XPI_DIRS:S!^!${_TD}/!} ${_TD} .for dist in ${XPI_DISTNAMES} XPI_XPIDIR_${dist}= ${XPI_LIBDIR}/${XPI_ID_${dist}} -_TD_${dist}= ${XPI_XPIDIR_${dist}:S,^${STAGEDIR}${PREFIX}/,,} +_TD_${dist}= ${XPI_XPIDIR_${dist}:S,^${PREFIX}/,,} PLIST_FILES+= ${XPI_FILES_${dist}:S!^!${_TD_${dist}}/!} PLIST_DIRS+= ${XPI_DIRS_${dist}:S!^!${_TD_${dist}}/!} ${_TD_${dist}} .endfor .if !target(do-install) do-install: - @${INSTALL} -d ${_TD_FULL} ${XPI_SLDIRS_ALL} - @${CP} -R ${WRKSRC}/ ${_TD_FULL}/ + @${MKDIR} ${STAGEDIR}${_TD_FULL} ${XPI_SLDIRS_ALL:S/^/${STAGEDIR}/} + @cd ${WRKSRC}; ${PAX} -rw . ${STAGEDIR}${_TD_FULL}/ @if [ -d ${FILESDIR} -a -f ${FILESDIR}/chrome.manifest ] ; \ - then ${CP} ${FILESDIR}/chrome.manifest ${_TD_FULL}/ ; fi - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${_TD_FULL}/ - @${CHMOD} -R a+rX,go-w ${_TD_FULL}/ - @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${_Q} ; } + then ${INSTALL_DATA} ${FILESDIR}/chrome.manifest ${STAGEDIR}${_TD_FULL}/ ; fi + @${CHMOD} -R a+rX,go-w ${STAGEDIR}${_TD_FULL}/ + @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} ${STAGEDR}$$_dir/ ${_Q} ; } @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${STAGEDIR}${PREFIX},%D,}' ${_A} @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${_Q}; }' ${_A} @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${XPI_ID} ; }' ${_A} |