diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-06-07 17:54:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-06-07 17:55:09 +0200 |
| commit | 459e482c7a9ba9aff5b5a505cc54247493202b46 (patch) | |
| tree | d5baed88d92e4564e018fa00c2c8d1051c72a291 /postprocess | |
| parent | d4924b747eb6abd439a6313e338384ae50cbdc8e (diff) | |
Make webdav and odma ucp configuration properly conditional
Change-Id: I9a8eb6a1e9af051d458a5462c01357540c3d9277
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 2d1d396890ba..1749b5f345eb 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -316,7 +316,8 @@ MY_FILES_main += \ $(MY_MOD)/org/openoffice/Inet-wnt.xcu \ $(MY_MOD)/org/openoffice/Office/Accelerators-unxwnt.xcu \ $(MY_MOD)/org/openoffice/Office/Common-wnt.xcu \ - $(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu + $(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu \ + $(MY_MOD)/org/openoffice/ucb/Configuration-win.xcu # Inet-wnt.xcu must come after Inet.xcu MY_DRIVERS += ado .ELIF "$(GUIBASE)" == "cocoatouch" @@ -328,6 +329,9 @@ MY_DRIVERS += ado .ELSE ERROR : unknown-GUIBASE .END +.IF "$(DISABLE_NEON)" != "TRUE" +MY_FILES_main += $(MY_MOD)/org/openoffice/ucb/Configuration-neon.xcu +.END .IF "$(ENABLE_EVOAB2)" == "TRUE" MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu |