diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-23 19:34:09 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-24 12:54:32 +0100 |
| commit | 5234c1bf13014e1e12aab12e91754b36dac50a82 (patch) | |
| tree | b694680cc3b490876c6c1582c6dec3a719ae8f66 /liblangtag | |
| parent | 47ba53c3c8675b0a308f7478f0d1238922c8c438 (diff) | |
Move in-build liblangtag data to solver's unittest/installation/share
...let BRAND_BASE_DIR point to solver's unittest/installation during CppUnit
tests, and get rid of LIBLANGTAG_SHARE special case. (Intending to add further
code to CppUnit tests soon that requires a fake BRAND_BASE_DIR, so clean this
up now.)
Change-Id: Ia5f0f247e54952f901c37ca31eda53f9c6591458
Diffstat (limited to 'liblangtag')
| -rw-r--r-- | liblangtag/ExternalPackage_langtag_data.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/liblangtag/ExternalPackage_langtag_data.mk b/liblangtag/ExternalPackage_langtag_data.mk index 4b9fb2516235..f238a2450967 100644 --- a/liblangtag/ExternalPackage_langtag_data.mk +++ b/liblangtag/ExternalPackage_langtag_data.mk @@ -27,8 +27,8 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,langtag_data,langtag)) -$(eval $(call gb_ExternalPackage_add_files,langtag_data,share/liblangtag,data/language-subtag-registry.xml)) -$(eval $(call gb_ExternalPackage_add_files,langtag_data,share/liblangtag/common/bcp47,\ +$(eval $(call gb_ExternalPackage_add_files,langtag_data,unittest/installation/share/liblangtag,data/language-subtag-registry.xml)) +$(eval $(call gb_ExternalPackage_add_files,langtag_data,unittest/installation/share/liblangtag/common/bcp47,\ data/common/bcp47/calendar.xml \ data/common/bcp47/collation.xml \ data/common/bcp47/currency.xml \ @@ -41,6 +41,6 @@ $(eval $(call gb_ExternalPackage_add_files,langtag_data,share/liblangtag/common/ data/common/bcp47/transform_private_use.xml \ data/common/bcp47/variant.xml \ )) -$(eval $(call gb_ExternalPackage_add_files,langtag_data,share/liblangtag/common/supplemental,data/common/supplemental/likelySubtags.xml)) +$(eval $(call gb_ExternalPackage_add_files,langtag_data,unittest/installation/share/liblangtag/common/supplemental,data/common/supplemental/likelySubtags.xml)) # vim: set shiftwidth=4 tabstop=4 noexpandtab: |