From 99ddf8d5f8dac4fa2ed7f914e110e9f5b002bd12 Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Tue, 29 Oct 2002 12:51:30 +0000 Subject: 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 --- editors/openoffice-1.0/Makefile | 8 +++++--- editors/openoffice-1.1-devel/Makefile | 8 +++++--- editors/openoffice-1.1/Makefile | 8 +++++--- editors/openoffice-2.0-devel/Makefile | 8 +++++--- editors/openoffice-3-devel/Makefile | 8 +++++--- editors/openoffice-3/Makefile | 8 +++++--- editors/openoffice-devel/Makefile | 8 +++++--- editors/openoffice.org-1.0/Makefile | 8 +++++--- editors/openoffice.org-1.1-devel/Makefile | 8 +++++--- editors/openoffice.org-1.1/Makefile | 8 +++++--- editors/openoffice.org-2-RC/Makefile | 8 +++++--- editors/openoffice.org-2-devel/Makefile | 8 +++++--- editors/openoffice.org-2.0-devel/Makefile | 8 +++++--- editors/openoffice.org-2.0/Makefile | 8 +++++--- editors/openoffice.org-2/Makefile | 8 +++++--- editors/openoffice.org-3-RC/Makefile | 8 +++++--- editors/openoffice.org-3-devel/Makefile | 8 +++++--- editors/openoffice.org-3/Makefile | 8 +++++--- editors/openoffice.org-vcltesttool/Makefile | 8 +++++--- editors/openoffice/Makefile | 8 +++++--- 20 files changed, 100 insertions(+), 60 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 diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index 1c285c511f1d..183b40725c44 100644 --- a/editors/openoffice-1.1-devel/Makefile +++ b/editors/openoffice-1.1-devel/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 diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index 1c285c511f1d..183b40725c44 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/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 diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile index 1c285c511f1d..183b40725c44 100644 --- a/editors/openoffice-2.0-devel/Makefile +++ b/editors/openoffice-2.0-devel/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 diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 1c285c511f1d..183b40725c44 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/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 diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 1c285c511f1d..183b40725c44 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/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 diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 1c285c511f1d..183b40725c44 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/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 diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index 49bf420caa7e..4b4b1efd39fa 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-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 diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index 1c285c511f1d..183b40725c44 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/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 diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index 1c285c511f1d..183b40725c44 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/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 diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 1c285c511f1d..183b40725c44 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-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 diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 1c285c511f1d..183b40725c44 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/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 diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index 1c285c511f1d..183b40725c44 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/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 diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index 1c285c511f1d..183b40725c44 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/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 diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 1c285c511f1d..183b40725c44 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/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 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 diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 1c285c511f1d..183b40725c44 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/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 diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 1c285c511f1d..183b40725c44 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/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 diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 1c285c511f1d..183b40725c44 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/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 diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index 49bf420caa7e..4b4b1efd39fa 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/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 -- cgit v1.2.3