strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gbuild: fix gb_Extension_use_default_description

Browse source 
Passing a target local variable like $(LOCATION) to
gb_Extension_add_file does not result in an actual dependency on the file.

Change-Id: Ide77ab81f19877267056bf8e50d69c9cfedcda79
This commit is contained in:
Michael Stahl 2013-11-03 23:47:20 +01:00
parent 1a940ae212
commit 5b609aebc4
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysqlc/Extension_mysql-connector-ooo.mk
View file

@ -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))

2
nlpsolver/Extension_nlpsolver.mk
View file

@ -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))

4
solenv/gbuild/Extension.mk
View file

@ -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)

2
swext/Extension_wiki-publisher.mk
View file

@ -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)