diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-09-12 20:03:54 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-09-12 23:51:15 +0300 |
| commit | 8186717d70d438957537430c57c3a598eaa8cc73 (patch) | |
| tree | 56b4e400d8723791b278c1738b088e1f62cf64ce /solenv | |
| parent | 2a6e20670c5081165e0895bc1cdbe65d898c5d86 (diff) | |
Use $(LIBO_SHARE_FOLDER) instead of hardcoded 'share'
Change-Id: I073d44c0e3e8c6eff0e885f827fa661e3c8e5206
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Dictionary.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Extension.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk index 651d5ae9827d..8b8c8c56f8f9 100644 --- a/solenv/gbuild/Dictionary.mk +++ b/solenv/gbuild/Dictionary.mk @@ -185,7 +185,7 @@ endef # all installed files of the dictionary. gb_Dictionary_ALL_LANGS := $(filter-out en-US,$(gb_WITH_LANG)) -gb_Dictionary_INSTDIR := share/extensions +gb_Dictionary_INSTDIR := $(LIBO_SHARE_FOLDER)/extensions $(dir $(call gb_Dictionary_get_target,%)).dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 419deb682b19..18857558a2b3 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -150,7 +150,7 @@ endef # gb_Extension__Extension_deliver extension package-name define gb_Extension__Extension_deliver $(call gb_GeneratedPackage_GeneratedPackage,$(2),$(dir $(call gb_Extension_get_rootdir,$(1)))) -$(call gb_GeneratedPackage_add_dir,$(2),$(INSTROOT)/share/extensions/$(1),$(notdir $(call gb_Extension_get_rootdir,$(1)))) +$(call gb_GeneratedPackage_add_dir,$(2),$(INSTROOT)/$(LIBO_SHARE_FOLDER)/extensions/$(1),$(notdir $(call gb_Extension_get_rootdir,$(1)))) $(call gb_GeneratedPackage_get_target,$(2)) : $(call gb_Extension_get_target,$(1)) $(call gb_Extension__get_final_target,$(1)) : $(call gb_GeneratedPackage_get_target,$(2)) |