8 files changed, 28 insertions, 60 deletions

diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index dce33f4a1c34..6c5d623d2538 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -212,15 +212,13 @@ post-patch:
 
 .include <${FILESDIR}/Makefile.mozilla>
 
+.if !defined(WITHOUT_MOZILLA) && \
+	!exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip) && \
+	!exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip) && \
+	!exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
+do-build: mozilla
+.else
 do-build:
-.if !defined(WITHOUT_MOZILLA)
-.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
 .endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
diff --git a/editors/openoffice-1.1-devel/files/Makefile.mozilla b/editors/openoffice-1.1-devel/files/Makefile.mozilla
index f96a2ff85222..76dcf66d34f2 100644
--- a/editors/openoffice-1.1-devel/files/Makefile.mozilla
+++ b/editors/openoffice-1.1-devel/files/Makefile.mozilla
@@ -52,10 +52,4 @@ register-mozilla:
 	@cd ${WRKDIR}/mozilla-runtime ; ${FIND} . -type f \
 		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
 
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
+mozilla: extract-mozilla patch-mozilla build-mozilla register-mozilla install-mozilla
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index be9d7c521ad5..c057eb47d365 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -217,15 +217,13 @@ post-patch:
 
 .include <${FILESDIR}/Makefile.mozilla>
 
+.if !defined(WITHOUT_MOZILLA) && \
+	!exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip) && \
+	!exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip) && \
+	!exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
+do-build: mozilla
+.else
 do-build:
-.if !defined(WITHOUT_MOZILLA)
-.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
 .endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
diff --git a/editors/openoffice-1.1/files/Makefile.mozilla b/editors/openoffice-1.1/files/Makefile.mozilla
index f96a2ff85222..76dcf66d34f2 100644
--- a/editors/openoffice-1.1/files/Makefile.mozilla
+++ b/editors/openoffice-1.1/files/Makefile.mozilla
@@ -52,10 +52,4 @@ register-mozilla:
 	@cd ${WRKDIR}/mozilla-runtime ; ${FIND} . -type f \
 		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
 
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
+mozilla: extract-mozilla patch-mozilla build-mozilla register-mozilla install-mozilla
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index dce33f4a1c34..6c5d623d2538 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -212,15 +212,13 @@ post-patch:
 
 .include <${FILESDIR}/Makefile.mozilla>
 
+.if !defined(WITHOUT_MOZILLA) && \
+	!exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip) && \
+	!exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip) && \
+	!exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
+do-build: mozilla
+.else
 do-build:
-.if !defined(WITHOUT_MOZILLA)
-.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
 .endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
diff --git a/editors/openoffice.org-1.1-devel/files/Makefile.mozilla b/editors/openoffice.org-1.1-devel/files/Makefile.mozilla
index f96a2ff85222..76dcf66d34f2 100644
--- a/editors/openoffice.org-1.1-devel/files/Makefile.mozilla
+++ b/editors/openoffice.org-1.1-devel/files/Makefile.mozilla
@@ -52,10 +52,4 @@ register-mozilla:
 	@cd ${WRKDIR}/mozilla-runtime ; ${FIND} . -type f \
 		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
 
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
+mozilla: extract-mozilla patch-mozilla build-mozilla register-mozilla install-mozilla
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index be9d7c521ad5..c057eb47d365 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -217,15 +217,13 @@ post-patch:
 
 .include <${FILESDIR}/Makefile.mozilla>
 
+.if !defined(WITHOUT_MOZILLA) && \
+	!exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip) && \
+	!exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip) && \
+	!exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
+do-build: mozilla
+.else
 do-build:
-.if !defined(WITHOUT_MOZILLA)
-.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
 .endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
diff --git a/editors/openoffice.org-1.1/files/Makefile.mozilla b/editors/openoffice.org-1.1/files/Makefile.mozilla
index f96a2ff85222..76dcf66d34f2 100644
--- a/editors/openoffice.org-1.1/files/Makefile.mozilla
+++ b/editors/openoffice.org-1.1/files/Makefile.mozilla
@@ -52,10 +52,4 @@ register-mozilla:
 	@cd ${WRKDIR}/mozilla-runtime ; ${FIND} . -type f \
 		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
 
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
+mozilla: extract-mozilla patch-mozilla build-mozilla register-mozilla install-mozilla