diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-10-29 12:51:30 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-10-29 12:51:30 +0000 |
| commit | 99ddf8d5f8dac4fa2ed7f914e110e9f5b002bd12 (patch) | |
| tree | 5fa8bb96f0e06e8daa65668f67ac54b537e5e4fc /editors/openoffice-1.0 | |
| parent | Update 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-1.0')
| -rw-r--r-- | editors/openoffice-1.0/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 49bf420caa7e..4b4b1efd39fa 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -397,11 +397,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) @@ -428,9 +426,13 @@ mozilla: @${MAKE} install-mozilla do-build: -.if ! exists(${WRKDIR}/../moz/zipped/FREEBSDGCCIruntime.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 |