From 59a513b8ee25940c295f40d571b5b3c59110b07e Mon Sep 17 00:00:00 2001 From: Andrew Pantyukhin Date: Fri, 28 Jul 2006 19:25:26 +0000 Subject: [PATCH] - Sync customized targets to current Makefile.xpi --- mail/thunderbird-esr-i18n/Makefile | 16 ++++++++-------- mail/thunderbird-i18n/Makefile | 16 ++++++++-------- mail/thunderbird3-i18n/Makefile | 16 ++++++++-------- www/firefox-esr-i18n/Makefile | 16 ++++++++-------- www/firefox-i18n/Makefile | 16 ++++++++-------- www/firefox3-i18n/Makefile | 16 ++++++++-------- www/firefox35-i18n/Makefile | 16 ++++++++-------- www/firefox36-i18n/Makefile | 16 ++++++++-------- 8 files changed, 64 insertions(+), 64 deletions(-) diff --git a/mail/thunderbird-esr-i18n/Makefile b/mail/thunderbird-esr-i18n/Makefile index 8afa8dc1be2d..a9c64f77d1fb 100644 --- a/mail/thunderbird-esr-i18n/Makefile +++ b/mail/thunderbird-esr-i18n/Makefile @@ -51,16 +51,16 @@ do-extract: done do-install: - @${INSTALL} -d ${XPI_LIBDIR} - @${CP} -Rp ${WRKSRC}/ ${XPI_LIBDIR} + @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL} + @${CP} -Rp ${WRKSRC}/ ${XPI_LIBDIR}/ @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/ @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/ - @for _app in ${XPI_APPS} ; { for _xpi in ${XPI_LIBDIR}/${WDIR} ; { \ - ${LN} -sf $$_xpi $$_app ${_Q} ; } ; } - @${ECHO_CMD} '@exec for _app in ${XPI_APPS} ; { for _xpi in ${XPI_LIBDIR}/${WDIR} ; { \ - ${LN} -sf $$_xpi $$_app ${_Q} ; } ; }' ${_A} - @${ECHO_CMD} '@unexec for _app in ${XPI_APPS} ; { ${RM} -f $$_app/${WDIR} ; }' ${_A} - @${ECHO_CMD} '@unexec rmdir ${XPI_LIBDIR:S,^${PREFIX},%D,} ${_Q}' ${_A} + @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; } + @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} + @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ + ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} + @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${WDIR} ; }' ${_A} + @${ECHO_CMD} '@unexec rmdir ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile index 8afa8dc1be2d..a9c64f77d1fb 100644 --- a/mail/thunderbird-i18n/Makefile +++ b/mail/thunderbird-i18n/Makefile @@ -51,16 +51,16 @@ do-extract: done do-install: - @${INSTALL} -d ${XPI_LIBDIR} - @${CP} -Rp ${WRKSRC}/ ${XPI_LIBDIR} + @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL} + @${CP} -Rp ${WRKSRC}/ ${XPI_LIBDIR}/ @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/ @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/ - @for _app in ${XPI_APPS} ; { for _xpi in ${XPI_LIBDIR}/${WDIR} ; { \ - ${LN} -sf $$_xpi $$_app ${_Q} ; } ; } - @${ECHO_CMD} '@exec for _app in ${XPI_APPS} ; { for _xpi in ${XPI_LIBDIR}/${WDIR} ; { \ - ${LN} -sf $$_xpi $$_app ${_Q} ; } ; }' ${_A} - @${ECHO_CMD} '@unexec for _app in ${XPI_APPS} ; { ${RM} -f $$_app/${WDIR} ; }' ${_A} - @${ECHO_CMD} '@unexec rmdir ${XPI_LIBDIR:S,^${PREFIX},%D,} ${_Q}' ${_A} + @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; } + @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} + @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ + ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} + @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${WDIR} ; }' ${_A} + @${ECHO_CMD} '@unexec rmdir ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ diff --git a/mail/thunderbird3-i18n/Makefile b/mail/thunderbird3-i18n/Makefile index 8afa8dc1be2d..a9c64f77d1fb 100644 --- a/mail/thunderbird3-i18n/Makefile +++ b/mail/thunderbird3-i18n/Makefile @@ -51,16 +51,16 @@ do-extract: done do-install: - @${INSTALL} -d ${XPI_LIBDIR} - @${CP} -Rp ${WRKSRC}/ ${XPI_LIBDIR} + @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL} + @${CP} -Rp ${WRKSRC}/ ${XPI_LIBDIR}/ @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/ @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/ - @for _app in ${XPI_APPS} ; { for _xpi in ${XPI_LIBDIR}/${WDIR} ; { \ - ${LN} -sf $$_xpi $$_app ${_Q} ; } ; } - @${ECHO_CMD} '@exec for _app in ${XPI_APPS} ; { for _xpi in ${XPI_LIBDIR}/${WDIR} ; { \ - ${LN} -sf $$_xpi $$_app ${_Q} ; } ; }' ${_A} - @${ECHO_CMD} '@unexec for _app in ${XPI_APPS} ; { ${RM} -f $$_app/${WDIR} ; }' ${_A} - @${ECHO_CMD} '@unexec rmdir ${XPI_LIBDIR:S,^${PREFIX},%D,} ${_Q}' ${_A} + @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; } + @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} + @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ + ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} + @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${WDIR} ; }' ${_A} + @${ECHO_CMD} '@unexec rmdir ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ diff --git a/www/firefox-esr-i18n/Makefile b/www/firefox-esr-i18n/Makefile index 235773762438..f2619edda13a 100644 --- a/www/firefox-esr-i18n/Makefile +++ b/www/firefox-esr-i18n/Makefile @@ -51,16 +51,16 @@ do-extract: done do-install: - @${INSTALL} -d ${XPI_LIBDIR} - @${CP} -Rp ${WRKSRC}/ ${XPI_LIBDIR} + @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL} + @${CP} -Rp ${WRKSRC}/ ${XPI_LIBDIR}/ @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/ @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/ - @for _app in ${XPI_APPS} ; { for _xpi in ${XPI_LIBDIR}/${WDIR} ; { \ - ${LN} -sf $$_xpi $$_app ${_Q} ; } ; } - @${ECHO_CMD} '@exec for _app in ${XPI_APPS} ; { for _xpi in ${XPI_LIBDIR}/${WDIR} ; { \ - ${LN} -sf $$_xpi $$_app ${_Q} ; } ; }' ${_A} - @${ECHO_CMD} '@unexec for _app in ${XPI_APPS} ; { ${RM} -f $$_app/${WDIR} ; }' ${_A} - @${ECHO_CMD} '@unexec rmdir ${XPI_LIBDIR:S,^${PREFIX},%D,} ${_Q}' ${_A} + @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; } + @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} + @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ + ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} + @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${WDIR} ; }' ${_A} + @${ECHO_CMD} '@unexec rmdir ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile index 235773762438..f2619edda13a 100644 --- a/www/firefox-i18n/Makefile +++ b/www/firefox-i18n/Makefile @@ -51,16 +51,16 @@ do-extract: done do-install: - @${INSTALL} -d ${XPI_LIBDIR} - @${CP} -Rp ${WRKSRC}/ ${XPI_LIBDIR} + @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL} + @${CP} -Rp ${WRKSRC}/ ${XPI_LIBDIR}/ @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/ @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/ - @for _app in ${XPI_APPS} ; { for _xpi in ${XPI_LIBDIR}/${WDIR} ; { \ - ${LN} -sf $$_xpi $$_app ${_Q} ; } ; } - @${ECHO_CMD} '@exec for _app in ${XPI_APPS} ; { for _xpi in ${XPI_LIBDIR}/${WDIR} ; { \ - ${LN} -sf $$_xpi $$_app ${_Q} ; } ; }' ${_A} - @${ECHO_CMD} '@unexec for _app in ${XPI_APPS} ; { ${RM} -f $$_app/${WDIR} ; }' ${_A} - @${ECHO_CMD} '@unexec rmdir ${XPI_LIBDIR:S,^${PREFIX},%D,} ${_Q}' ${_A} + @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; } + @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} + @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ + ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} + @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${WDIR} ; }' ${_A} + @${ECHO_CMD} '@unexec rmdir ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ diff --git a/www/firefox3-i18n/Makefile b/www/firefox3-i18n/Makefile index 235773762438..f2619edda13a 100644 --- a/www/firefox3-i18n/Makefile +++ b/www/firefox3-i18n/Makefile @@ -51,16 +51,16 @@ do-extract: done do-install: - @${INSTALL} -d ${XPI_LIBDIR} - @${CP} -Rp ${WRKSRC}/ ${XPI_LIBDIR} + @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL} + @${CP} -Rp ${WRKSRC}/ ${XPI_LIBDIR}/ @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/ @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/ - @for _app in ${XPI_APPS} ; { for _xpi in ${XPI_LIBDIR}/${WDIR} ; { \ - ${LN} -sf $$_xpi $$_app ${_Q} ; } ; } - @${ECHO_CMD} '@exec for _app in ${XPI_APPS} ; { for _xpi in ${XPI_LIBDIR}/${WDIR} ; { \ - ${LN} -sf $$_xpi $$_app ${_Q} ; } ; }' ${_A} - @${ECHO_CMD} '@unexec for _app in ${XPI_APPS} ; { ${RM} -f $$_app/${WDIR} ; }' ${_A} - @${ECHO_CMD} '@unexec rmdir ${XPI_LIBDIR:S,^${PREFIX},%D,} ${_Q}' ${_A} + @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; } + @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} + @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ + ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} + @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${WDIR} ; }' ${_A} + @${ECHO_CMD} '@unexec rmdir ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ diff --git a/www/firefox35-i18n/Makefile b/www/firefox35-i18n/Makefile index 235773762438..f2619edda13a 100644 --- a/www/firefox35-i18n/Makefile +++ b/www/firefox35-i18n/Makefile @@ -51,16 +51,16 @@ do-extract: done do-install: - @${INSTALL} -d ${XPI_LIBDIR} - @${CP} -Rp ${WRKSRC}/ ${XPI_LIBDIR} + @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL} + @${CP} -Rp ${WRKSRC}/ ${XPI_LIBDIR}/ @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/ @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/ - @for _app in ${XPI_APPS} ; { for _xpi in ${XPI_LIBDIR}/${WDIR} ; { \ - ${LN} -sf $$_xpi $$_app ${_Q} ; } ; } - @${ECHO_CMD} '@exec for _app in ${XPI_APPS} ; { for _xpi in ${XPI_LIBDIR}/${WDIR} ; { \ - ${LN} -sf $$_xpi $$_app ${_Q} ; } ; }' ${_A} - @${ECHO_CMD} '@unexec for _app in ${XPI_APPS} ; { ${RM} -f $$_app/${WDIR} ; }' ${_A} - @${ECHO_CMD} '@unexec rmdir ${XPI_LIBDIR:S,^${PREFIX},%D,} ${_Q}' ${_A} + @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; } + @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} + @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ + ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} + @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${WDIR} ; }' ${_A} + @${ECHO_CMD} '@unexec rmdir ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ diff --git a/www/firefox36-i18n/Makefile b/www/firefox36-i18n/Makefile index 235773762438..f2619edda13a 100644 --- a/www/firefox36-i18n/Makefile +++ b/www/firefox36-i18n/Makefile @@ -51,16 +51,16 @@ do-extract: done do-install: - @${INSTALL} -d ${XPI_LIBDIR} - @${CP} -Rp ${WRKSRC}/ ${XPI_LIBDIR} + @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL} + @${CP} -Rp ${WRKSRC}/ ${XPI_LIBDIR}/ @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/ @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/ - @for _app in ${XPI_APPS} ; { for _xpi in ${XPI_LIBDIR}/${WDIR} ; { \ - ${LN} -sf $$_xpi $$_app ${_Q} ; } ; } - @${ECHO_CMD} '@exec for _app in ${XPI_APPS} ; { for _xpi in ${XPI_LIBDIR}/${WDIR} ; { \ - ${LN} -sf $$_xpi $$_app ${_Q} ; } ; }' ${_A} - @${ECHO_CMD} '@unexec for _app in ${XPI_APPS} ; { ${RM} -f $$_app/${WDIR} ; }' ${_A} - @${ECHO_CMD} '@unexec rmdir ${XPI_LIBDIR:S,^${PREFIX},%D,} ${_Q}' ${_A} + @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; } + @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} + @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ + ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} + @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${WDIR} ; }' ${_A} + @${ECHO_CMD} '@unexec rmdir ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \