diff options
| author | maho <maho@FreeBSD.org> | 2004-03-13 10:33:31 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2004-03-13 10:33:31 +0800 |
| commit | ffbec2987461c668cae03dafb71bf49e24eb1b5c (patch) | |
| tree | 95fd880c2c75aecd836ed8295ec4b9aacf8a8d86 /editors | |
| parent | dfe44f537b5bb2648772e30d8c872f2e88712b9d (diff) | |
| download | freebsd-ports-gnome-ffbec2987461c668cae03dafb71bf49e24eb1b5c.tar.gz freebsd-ports-gnome-ffbec2987461c668cae03dafb71bf49e24eb1b5c.tar.zst freebsd-ports-gnome-ffbec2987461c668cae03dafb71bf49e24eb1b5c.zip | |
clean up do-install and install-user section
(do-install section was wrong. alinged to tab...)
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/openoffice-1.1-devel/Makefile | 13 | ||||
| -rw-r--r-- | editors/openoffice-1.1/Makefile | 13 | ||||
| -rw-r--r-- | editors/openoffice.org-1.1-devel/Makefile | 13 | ||||
| -rw-r--r-- | editors/openoffice.org-1.1/Makefile | 13 |
4 files changed, 20 insertions, 32 deletions
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index b753a1863648..6e7262453080 100644 --- a/editors/openoffice-1.1-devel/Makefile +++ b/editors/openoffice-1.1-devel/Makefile @@ -473,20 +473,17 @@ do-install: # ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 - @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ - @SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \ - ./install --prefix=${PREFIX} + @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ + SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid .else - @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ - @SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \ - ./install --prefix=${PREFIX} + @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ + SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} .endif install-user: - @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \ - ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup + @SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup post-install: @${ECHO_MSG} "===> Add wrapper scripts"; diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index b753a1863648..6e7262453080 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -473,20 +473,17 @@ do-install: # ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 - @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ - @SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \ - ./install --prefix=${PREFIX} + @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ + SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid .else - @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ - @SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \ - ./install --prefix=${PREFIX} + @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ + SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} .endif install-user: - @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \ - ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup + @SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup post-install: @${ECHO_MSG} "===> Add wrapper scripts"; diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index b753a1863648..6e7262453080 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/Makefile @@ -473,20 +473,17 @@ do-install: # ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 - @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ - @SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \ - ./install --prefix=${PREFIX} + @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ + SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid .else - @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ - @SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \ - ./install --prefix=${PREFIX} + @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ + SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} .endif install-user: - @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \ - ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup + @SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup post-install: @${ECHO_MSG} "===> Add wrapper scripts"; diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index b753a1863648..6e7262453080 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -473,20 +473,17 @@ do-install: # ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 - @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ - @SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \ - ./install --prefix=${PREFIX} + @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ + SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid .else - @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ - @SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \ - ./install --prefix=${PREFIX} + @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ + SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} .endif install-user: - @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \ - ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup + @SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup post-install: @${ECHO_MSG} "===> Add wrapper scripts"; |