diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-10-12 23:11:30 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-10-12 23:21:50 +0200 |
| commit | eb15d03b906cfc183d455f69922eab3a8e6d0006 (patch) | |
| tree | 77638e06dd523f358c6edeb3c8fbbd9e51eb0c12 /swext | |
| parent | 6659c12d12d5a00b618b9fe30c4b0d14df8f61d5 (diff) | |
Configuration.mk: add nodeliver mode
Add a special mode where a Configuration does not deliver to the solver,
and use it in Configuration_mediawiki, preventing the files from
officecfg being overwritten by files from swext.
Should fix the annoying sc_test_filters failure and the smoketest
as well if the mediawiki extension is enabled.
Diffstat (limited to 'swext')
| -rw-r--r-- | swext/Configuration_mediawiki.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/swext/Configuration_mediawiki.mk b/swext/Configuration_mediawiki.mk index 9ece045fdddc..23d10e77dba3 100644 --- a/swext/Configuration_mediawiki.mk +++ b/swext/Configuration_mediawiki.mk @@ -27,14 +27,11 @@ # instead of those above. # -$(eval $(call gb_Configuration_Configuration,mediawiki,SRCDIR)) +$(eval $(call gb_Configuration_Configuration,mediawiki,SRCDIR,nodeliver)) $(eval $(call gb_Configuration_add_datas,mediawiki,swext/mediawiki/src/registry/data,\ - org/openoffice/Office/Addons.xcu \ - org/openoffice/Office/OptionsDialog.xcu \ org/openoffice/Office/ProtocolHandler.xcu \ org/openoffice/Office/Paths.xcu \ - org/openoffice/Office/Custom/WikiExtension.xcu \ org/openoffice/TypeDetection/Filter.xcu \ org/openoffice/TypeDetection/Types.xcu \ )) @@ -47,4 +44,4 @@ $(eval $(call gb_Configuration_add_localized_datas,mediawiki,swext/mediawiki/src $(eval $(call gb_Configuration_add_schemas,mediawiki,swext/mediawiki/src/registry/schema,\ org/openoffice/Office/Custom/WikiExtension.xcs \ -)) +)) |