summaryrefslogtreecommitdiff
path: root/liblangtag
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-08-18 18:45:45 +0200
committerTor Lillqvist <tml@iki.fi>2013-08-18 21:11:16 +0300
commit058a3d1c46449dd5159bae30c83db4c2c5c335b4 (patch)
tree28fae22c49b9cecdda52aa148dde2aba2b568ff9 /liblangtag
parentbd2f7ef662122d5c1202911cb2f3b0ab1e124695 (diff)
Further work on the "Mac-like app structure" option
Lots of stuff still either ended up in the wrong place, or was looked up from the wrong place, or both. Fix most cases. Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4
Diffstat (limited to 'liblangtag')
-rw-r--r--liblangtag/ExternalPackage_liblangtag_data.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/liblangtag/ExternalPackage_liblangtag_data.mk b/liblangtag/ExternalPackage_liblangtag_data.mk
index 605af552ad97..54790a178841 100644
--- a/liblangtag/ExternalPackage_liblangtag_data.mk
+++ b/liblangtag/ExternalPackage_liblangtag_data.mk
@@ -11,11 +11,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag_data,langtag))
$(eval $(call gb_ExternalPackage_set_outdir,liblangtag_data,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,share/liblangtag,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag,\
data/language-subtag-registry.xml \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,share/liblangtag/common/bcp47,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag/common/bcp47,\
data/common/bcp47/calendar.xml \
data/common/bcp47/collation.xml \
data/common/bcp47/currency.xml \
@@ -29,7 +29,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,share/liblan
data/common/bcp47/variant.xml \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,share/liblangtag/common/supplemental,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag/common/supplemental,\
data/common/supplemental/likelySubtags.xml \
))