From f4926f2310be4870c948df806053f6573259e10f Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 8 Mar 2012 08:14:20 +0100 Subject: sdext: Configuration: use nodeliver mode Preventing the files from officecfg being overwritten by files from sdext. Should fix the smoketest failure if the extensions are enabled. --- sdext/Configuration_minimizer.mk | 2 +- sdext/Configuration_presenter.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdext/Configuration_minimizer.mk b/sdext/Configuration_minimizer.mk index d0bbbb3db875..6af15c195062 100644 --- a/sdext/Configuration_minimizer.mk +++ b/sdext/Configuration_minimizer.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Configuration_Configuration_nozip,presentation-minimizer)) +$(eval $(call gb_Configuration_Configuration,presentation-minimizer,nodeliver)) $(eval $(call gb_Configuration_add_schemas,presentation-minimizer,sdext/source/minimizer/registry/schema,\ org/openoffice/Office/extension/SunPresentationMinimizer.xcs \ diff --git a/sdext/Configuration_presenter.mk b/sdext/Configuration_presenter.mk index 73b5aa776408..456a17294049 100644 --- a/sdext/Configuration_presenter.mk +++ b/sdext/Configuration_presenter.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Configuration_Configuration_nozip,presenter-screen)) +$(eval $(call gb_Configuration_Configuration,presenter-screen,nodeliver)) $(eval $(call gb_Configuration_add_schemas,presenter-screen,sdext/source/presenter/registry/schema,\ org/openoffice/Office/extension/PresenterScreen.xcs \ -- cgit