summaryrefslogtreecommitdiff
path: root/editors/openoffice-1.0
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2002-10-15 21:01:14 +0000
committerMartin Blapp <mbr@FreeBSD.org>2002-10-15 21:01:14 +0000
commitdba4ff65f40d2ef77e71197579eb664c6f34859d (patch)
treebce7f65d944022b14c4ba5e097a8a75f290c7772 /editors/openoffice-1.0
parentUpdate to 2.3 (diff)
Allow aborted builds to resume again.
Notes
Notes: svn path=/head/; revision=68121
Diffstat (limited to 'editors/openoffice-1.0')
-rw-r--r--editors/openoffice-1.0/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index 081789011947..8b94d07610bc 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -371,7 +371,7 @@ patch-mozilla:
@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIinc.zip)
+.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
@${ECHO_MSG} "===> Building mozilla sub project"
.if defined(WITH_DEBUG)
@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
@@ -409,7 +409,7 @@ register-mozilla:
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
- @${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
+ @-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom
@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
@@ -426,7 +426,9 @@ mozilla:
@${MAKE} install-mozilla
do-build:
+.if ! exists(${WRKDIR}/../moz/zipped/FREEBSDGCCIruntime.zip)
@${MAKE} mozilla
+.endif
.if exists(${WRKDIR}/.Xvfb.pid)
@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
@${RM} -f ${WRKDIR}/.Xvfb.pid