diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2004-03-13 02:33:31 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2004-03-13 02:33:31 +0000 |
| commit | b331e700df5e751ef21e50abcda6e88b4f414c08 (patch) | |
| tree | b26ac8ede9a94259a49e1baa915ab38cf5e2812d /editors/openoffice-1.1 | |
| parent | Response file while installation is not needed. (diff) | |
clean up do-install and install-user section
(do-install section was wrong. alinged to tab...)
Diffstat (limited to 'editors/openoffice-1.1')
| -rw-r--r-- | editors/openoffice-1.1/Makefile | 13 |
1 files changed, 5 insertions, 8 deletions
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"; |