solenv/gbuild/Extension.mk | 1 - swext/Extension_wiki-publisher.mk | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-)
New commits: commit 2cd98654de1975a64661efb1efb99eb8f081bd68 Author: Andras Timar <ati...@suse.com> Date: Wed Jan 4 11:23:04 2012 +0100 pack UI localizations with MediaWiki extension diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index 61b39cd..4db566d 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -37,14 +37,14 @@ $(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$( $(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.3.jar,$(OUTDIR)/bin/commons-lang-2.3.jar)) $(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.1.1.jar,$(OUTDIR)/bin/commons-logging-1.1.1.jar)) endif -$(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Addons.xcu)) +$(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(WORKDIR)/XcuMergeTarget/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu)) $(eval $(call gb_Extension_add_file,wiki-publisher,Filter.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Filter.xcu)) -$(eval $(call gb_Extension_add_file,wiki-publisher,OptionsDialog.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/OptionsDialog.xcu)) +$(eval $(call gb_Extension_add_file,wiki-publisher,OptionsDialog.xcu,$(WORKDIR)/XcuMergeTarget/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu)) $(eval $(call gb_Extension_add_file,wiki-publisher,Paths.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Paths.xcu)) $(eval $(call gb_Extension_add_file,wiki-publisher,ProtocolHandler.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu)) $(eval $(call gb_Extension_add_file,wiki-publisher,Types.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Types.xcu)) $(eval $(call gb_Extension_add_file,wiki-publisher,WikiExtension.xcs,$(WIKISRC)/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs)) -$(eval $(call gb_Extension_add_file,wiki-publisher,WikiExtension.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu)) +$(eval $(call gb_Extension_add_file,wiki-publisher,WikiExtension.xcu,$(WORKDIR)/XcuMergeTarget/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu)) $(eval $(call gb_Extension_add_file,wiki-publisher,mediawiki.jar,$(OUTDIR)/bin/mediawiki.jar)) $(eval $(call gb_Extension_add_file,wiki-publisher,components.rdb,$(WIKISRC)/src/components.rdb)) $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/EditSetting.xdl,$(WIKISRC)/dialogs/EditSetting.xdl)) commit 58d915f63011e4aef0e372cbc78a2e0c1095b079 Author: Andras Timar <ati...@suse.com> Date: Wed Jan 4 11:22:46 2012 +0100 remove leftover comment diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 94fdd2f..ec357c6 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -134,6 +134,5 @@ $(call gb_Extension_get_workdir,$(1))/$(2) : $(3) $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2) endef -# $(call gb_Output_announce,$@,$(true),PRP,3) # vim: set noet sw=4 ts=4: _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits