From fe4c47e41febceb4972d79874ccae4704be9b34b Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 18 Sep 2012 18:25:29 +0200
Subject: Some clean-up of mork-related changs

And reverted for now the configure error when --enable-mozilla on non-Windows;
it is still used for other features, too.

Change-Id: I1ce5ff1a7a3d140a1ab7ba1e905166d91229c926
---
 postprocess/packcomponents/makefile.mk | 16 +++-------------
 postprocess/packregistry/makefile.mk   | 16 ++--------------
 2 files changed, 5 insertions(+), 27 deletions(-)

(limited to 'postprocess')

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index c62d058e6060..8111a10f457a 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -375,25 +375,15 @@ my_components += \
     component/canvas/source/directx/gdipluscanvas
 .END
 
-.IF "$(OS)" != "IOS" && "$(OS)" != "ANDROID"
-
 .IF "$(OS)" == "WNT"
-
-.IF "$(OS)" != "MACOSX" && "$(SYSTEM_MOZILLA)" != "YES" && \
-    "$(WITH_MOZILLA)" != "NO"
+.IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO"
 my_components += component/connectivity/source/drivers/mozab/mozab
 .ELSE
 my_components += component/connectivity/source/drivers/mozab/bootstrap/mozbootstrap
 .END
-
-.ELSE
-
-# new and shiny mork driver
+.ELIF "$(OS)" != "ANDROID" && "$(OS)" != "IOS"
 my_components += component/connectivity/source/drivers/mork/mork
-
-.ENDIF
-
-.ENDIF
+.END
 
 .IF "$(OS)" != "WNT" && "$(OS)" != "ANDROID" && "$(OS)" != "IOS" && "$(OS)" != "headless"
 my_components += component/shell/source/cmdmail/cmdmail
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index bbbc2c32ae9f..9a8b33067fd8 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -352,26 +352,14 @@ MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-kab.xcu
 MY_DRIVERS += kab
 .END
 
-
-# somebody would simplify that? ;-)
-.IF "$(OS)" == "WNT"
-.IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO" && \
-        "$(OS)" != "MACOSX"
 .IF "$(OS)" == "WNT"
+.IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO"
 MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
 MY_DRIVERS += mozab
-.ELSE
-MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab2.xcu
-MY_DRIVERS += mozab2
-.END
 .END
-
-.ELSE
-
-# new and shiny mork driver
+.ELIF "$(OS)" != "ANDROID" && "$(OS)" != "IOS"
 MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
 MY_DRIVERS += mork
-
 .END
 
 .IF "$(SYSTEM_LIBEXTTEXTCAT_DATA)" != ""
-- 
cgit