diff options
| -rw-r--r-- | mysqlc/Extension_mysql-connector-ooo.mk | 2 | ||||
| -rw-r--r-- | nlpsolver/Extension_nlpsolver.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Extension.mk | 4 | ||||
| -rw-r--r-- | swext/Extension_wiki-publisher.mk | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/mysqlc/Extension_mysql-connector-ooo.mk b/mysqlc/Extension_mysql-connector-ooo.mk index d94905745271..1ca1f58efd9e 100644 --- a/mysqlc/Extension_mysql-connector-ooo.mk +++ b/mysqlc/Extension_mysql-connector-ooo.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Extension_Extension,mysql-connector-ooo,mysqlc/source)) -$(eval $(call gb_Extension_use_default_description,mysql-connector-ooo)) +$(eval $(call gb_Extension_use_default_description,mysql-connector-ooo,mysqlc/source/description-en-US.txt)) $(eval $(call gb_Extension_use_default_license,mysql-connector-ooo)) $(eval $(call gb_Extension_add_library,mysql-connector-ooo,mysqlc)) diff --git a/nlpsolver/Extension_nlpsolver.mk b/nlpsolver/Extension_nlpsolver.mk index 1dd3c75d2b49..8ec0e1afc343 100644 --- a/nlpsolver/Extension_nlpsolver.mk +++ b/nlpsolver/Extension_nlpsolver.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Extension_Extension,nlpsolver,nlpsolver/src/com/sun/star/comp/Calc/NLPSolver)) -$(eval $(call gb_Extension_use_default_description,nlpsolver)) +$(eval $(call gb_Extension_use_default_description,nlpsolver,nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description-en-US.txt)) $(eval $(call gb_Extension_use_default_license,nlpsolver)) $(eval $(call gb_Extension_add_file,nlpsolver,components.rdb,$(SRCDIR)/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/components.rdb)) diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index b4ac8a2dc6fa..8ec2fc4d7d6d 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -254,9 +254,9 @@ $(foreach lang,$(gb_Extension_ALL_LANGS), \ endef -# Use the default description file +# Use the given file as description-en-US.txt define gb_Extension_use_default_description -$(call gb_Extension_add_file,$(1),description-en-US.txt,$$(LOCATION)/description-en-US.txt) +$(call gb_Extension_add_file,$(1),description-en-US.txt,$(SRCDIR)/$(2)) $(call gb_Extension_get_target,$(1)) : DESCRIPTION := $(true) ifneq ($(strip $(gb_WITH_LANG)),) $(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(gb_Extension_TRANS_LANGS),description-$(lang).txt) diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index d43eb0055960..aeaff27c719f 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Extension_Extension,wiki-publisher,swext/mediawiki/src)) $(eval $(call gb_Extension_use_unpacked,wiki-publisher,xsltml)) -$(eval $(call gb_Extension_use_default_description,wiki-publisher)) +$(eval $(call gb_Extension_use_default_description,wiki-publisher,swext/mediawiki/src/description-en-US.txt)) $(eval $(call gb_Extension_use_default_license,wiki-publisher)) ifneq ($(SYSTEM_APACHE_COMMONS),YES) |