[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - postprocess/packcomponents

[Libreoffice Gerrit user]

 postprocess/packcomponents/makefile.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit f1a0ab2b5fcba57f372f6642e6c2dd68a50a8524
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Dec 5 11:17:35 2012 +0200

    Check WITH_MOZAB4WIN, this time the commit does just that

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index cd9db06..3caa0e7 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -374,7 +374,7 @@ my_components += \
 .END
 
 .IF "$(OS)" == "WNT"
-.IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO"
+.IF "$(WITH_MOZAB4WIN)" == "YES"
 my_components += component/connectivity/source/drivers/mozab/mozab
 .ELSE
 my_components += component/connectivity/source/drivers/mozab/bootstrap/mozbootstrap
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index f353ef2..952c1cc 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -351,7 +351,7 @@ MY_DRIVERS += kab
 .END
 
 .IF "$(OS)" == "WNT"
-.IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO"
+.IF "$(WITH_MOZAB4WIN)" == "YES"
 MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
 MY_DRIVERS += mozab
 .END
commit 81777690b330d6a0b8a377984e8d64124f7647f4
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Dec 5 11:12:21 2012 +0200

    Revert "Check WITH_MOZAB4WIN"
    
    The commit accidentally removed a line which was related to ODMA, not
    MOZAB, and that needs to be removed (if we want that here) in a
    separate commit. Sigh, shouldn't be doing many things at the same
    time.
    
    This reverts commit 748fd365ea3e6cb2b14f02858c1724559ac87eac.

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index fa3231c..cd9db06 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -337,6 +337,7 @@ my_components += \
     component/dtrans/util/dnd \
     component/dtrans/util/ftransl \
     component/dtrans/util/sysdtrans \
+    component/fpicker/source/odma/fps_odma \
     component/fpicker/source/win32/fps \
     component/shell/source/backends/wininetbe/wininetbe1 \
     component/shell/source/win32/simplemail/smplmail \
@@ -373,7 +374,7 @@ my_components += \
 .END
 
 .IF "$(OS)" == "WNT"
-.IF "$(WITH_MOZAB4WIN)" == "YES"
+.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
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 952c1cc..f353ef2 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -351,7 +351,7 @@ MY_DRIVERS += kab
 .END
 
 .IF "$(OS)" == "WNT"
-.IF "$(WITH_MOZAB4WIN)" == "YES"
+.IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO"
 MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
 MY_DRIVERS += mozab
 .END