diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-12-05 11:12:21 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-12-05 11:18:21 +0200 |
| commit | 81777690b330d6a0b8a377984e8d64124f7647f4 (patch) | |
| tree | ce21616ec226f4e4d013d24eaa7ae1b589f7a7af /postprocess | |
| parent | bc6e6261dbf4dab58f853b4b663dd76e5d80bd4f (diff) | |
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.
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 3 | ||||
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index fa3231c566aa..cd9db060254c 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 952c1cc01f60..f353ef29299f 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 |