summaryrefslogtreecommitdiff
path: root/swext
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2014-05-21 18:57:55 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2014-05-21 18:57:55 +0200
commitc15927f20d4727c3b8de68497b6949e72f9e6e9e (patch)
tree2e278d1d7a3279e596a8d4d61ab732fe346ad829 /swext
parent8f97326bdd3f42fc82aa5e1989fd03b0af1daf64 (diff)
the addfile rule doesn't like to continue on a new linelibreoffice-4-3-branch-point
breaks the build otherwise on the baseline Change-Id: I7a357bc9b541c86746ce3000af429ee024efeec1
Diffstat (limited to 'swext')
-rw-r--r--swext/Extension_wiki-publisher.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk
index a3d5b2b46115..3ed270e28ea3 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -22,13 +22,11 @@ $(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_co
$(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_httpclient))
$(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_lang))
-$(eval $(call gb_Extension_add_file,wiki-publisher,\
-$(if $(filter TRUE,$(HAVE_JAVA6)),commons-codec-1.9.jar,commons-codec-1.6.jar),\
+$(eval $(call gb_Extension_add_file,wiki-publisher,$(if $(filter TRUE,$(HAVE_JAVA6)),commons-codec-1.9.jar,commons-codec-1.6.jar),\
$(call gb_UnpackedTarball_get_dir,apache_commons_codec)$(if $(filter TRUE,$(HAVE_JAVA6)),/dist/commons-codec-1.9.jar,/dist/commons-codec-1.6-SNAPSHOT.jar)\
))
$(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)/dist/commons-httpclient.jar))
-$(eval $(call gb_Extension_add_file,wiki-publisher,\
-$(if $(filter TRUE,$(HAVE_JAVA6)),commons-lang3-3.3.1.jar,commons-lang-2.4.jar),\
+$(eval $(call gb_Extension_add_file,wiki-publisher,$(if $(filter TRUE,$(HAVE_JAVA6)),commons-lang3-3.3.1.jar,commons-lang-2.4.jar),\
$(call gb_UnpackedTarball_get_dir,apache_commons_lang)$(if $(filter TRUE,$(HAVE_JAVA6)),/target/commons-lang3-3.3.1.jar,/dist/commons-lang-2.4.jar)\
))
$(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.1.3.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.3.jar))