diff options
| author | mrauch <mrauch> | 2002-03-05 20:16:53 +0000 |
|---|---|---|
| committer | mrauch <mrauch> | 2002-03-05 20:16:53 +0000 |
| commit | 539732aaed05487352e0e97700fc365e3ba9e388 (patch) | |
| tree | fdbeb2072ce2231c4f1298657bfa3e1aa7550a2b /misc | |
| parent | e43e8984f4b74a18d22f6685cb092fd70d1547e7 (diff) | |
| download | pkgsrc-539732aaed05487352e0e97700fc365e3ba9e388.tar.gz | |
Rewrite the logic in do-install which tests if installation was successful.
This version hopefully won't blow up the bulk build.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile index 25d35ce182b..33372ebdc87 100644 --- a/misc/openoffice/Makefile +++ b/misc/openoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/03/02 09:09:38 mrauch Exp $ +# $NetBSD: Makefile,v 1.8 2002/03/05 20:16:53 mrauch Exp $ DISTNAME= openoffice-0.0.0.641 PKGREVISION= 1 @@ -79,14 +79,13 @@ pre-install: checkforx >oo_setup.resp" do-install: - ${SH} -c "cd ${WRKSRC}/../instsetoo/*.pro/01/normal; \ + -${SH} -c "cd ${WRKSRC}/../instsetoo/*.pro/01/normal; \ TEMP=${WRKDIR}; export TEMP; \ DISPLAY=${DISPLAY}; export DISPLAY; \ - ./setup -r:oo_setup.resp; \ - if ${TEST} -e ${PREFIX}/OpenOffice.org641/setup; \ - then ${TRUE}; \ - else ${FALSE}; \ - fi" + ./setup -r:oo_setup.resp" + @${SH} -c "if ! [ -x ${PREFIX}/OpenOffice.org641/setup ] ; \ + then ${ECHO} 'Installation was not successful.'; \ + ${FALSE}; fi" ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \ <${FILESDIR}/soffice >${PREFIX}/bin/soffice ${CHMOD} +x ${PREFIX}/bin/soffice |