diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-10-15 21:01:14 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-10-15 21:01:14 +0000 |
| commit | dba4ff65f40d2ef77e71197579eb664c6f34859d (patch) | |
| tree | bce7f65d944022b14c4ba5e097a8a75f290c7772 | |
| parent | Update to 2.3 (diff) | |
Allow aborted builds to resume again.
Notes
Notes:
svn path=/head/; revision=68121
| -rw-r--r-- | editors/openoffice-1.0/Makefile | 6 | ||||
| -rw-r--r-- | editors/openoffice.org-1.0/Makefile | 6 | ||||
| -rw-r--r-- | editors/openoffice/Makefile | 6 |
3 files changed, 12 insertions, 6 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 diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index 081789011947..8b94d07610bc 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-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 diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index 081789011947..8b94d07610bc 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/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 |