summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-3-RC
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2002-10-29 12:51:30 +0000
committerMartin Blapp <mbr@FreeBSD.org>2002-10-29 12:51:30 +0000
commit99ddf8d5f8dac4fa2ed7f914e110e9f5b002bd12 (patch)
tree5fa8bb96f0e06e8daa65668f67ac54b537e5e4fc /editors/openoffice.org-3-RC
parentUpdate to version 9.3f. (diff)
Remove one obsolete check and test if all three mozilla files
are on their place. Fix ${WRKDIR} -> ${WRKSRC} typo. Sponsored by: ImproWare AG, Network Services
Notes
Notes: svn path=/head/; revision=69099
Diffstat (limited to 'editors/openoffice.org-3-RC')
-rw-r--r--editors/openoffice.org-3-RC/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 1c285c511f1d..183b40725c44 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -399,11 +399,9 @@ build-mozilla:
.endif
install-mozilla:
-.if ! exists(${WRKDIR}/../moz/zipped/FREEBSDGCCIinc.zip)
@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-.endif
register-mozilla:
.if exists(${WRKDIR}/mozilla-runtime)
@@ -430,9 +428,13 @@ mozilla:
@${MAKE} install-mozilla
do-build:
-.if ! exists(${WRKDIR}/../moz/zipped/FREEBSDGCCIinc.zip)
+.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
+.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
+.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
@${MAKE} mozilla
.endif
+.endif
+.endif
.if exists(${WRKDIR}/.Xvfb.pid)
@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
@${RM} -f ${WRKDIR}/.Xvfb.pid