aboutsummaryrefslogtreecommitdiffstats
path: root/src/util/Android.mk
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2018-08-24 06:49:55 -0700
committerDylan Baker <[email protected]>2018-10-31 16:37:12 -0700
commit0621e91a8c975e34f2c2092ad3013d6ff81b5ac2 (patch)
tree9669c64bb512a57bf74ad583009d6b727121a401 /src/util/Android.mk
parent7834926a4f5ca0a60ec3d18c87a1e0a68b615820 (diff)
util/xmlpool: Update for meson generation
Meson won't put the .gmo files in the layout that python's gettext.translation() expects, it puts them in the build directory in a flat layout. This modifies android and autotools to do the same (scons doesn't work with translations at all) v3: - Squash 4 patches into this patch Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/util/Android.mk')
-rw-r--r--src/util/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util/Android.mk b/src/util/Android.mk
index e463b63e101..993a7f179f4 100644
--- a/src/util/Android.mk
+++ b/src/util/Android.mk
@@ -87,13 +87,13 @@ $(MESA_DRI_OPTIONS_LANGS:%=$(intermediates)/xmlpool/%.po): $(intermediates)/xmlp
PRIVATE_SCRIPT := $(LOCAL_PATH)/xmlpool/gen_xmlpool.py
PRIVATE_LOCALEDIR := $(intermediates)/xmlpool
PRIVATE_TEMPLATE_HEADER := $(LOCAL_PATH)/xmlpool/t_options.h
-PRIVATE_MO_FILES := $(MESA_DRI_OPTIONS_LANGS:%=$(intermediates)/xmlpool/%/LC_MESSAGES/options.mo)
+PRIVATE_MO_FILES := $(MESA_DRI_OPTIONS_LANGS:%=$(intermediates)/xmlpool/%.gmo)
LOCAL_GENERATED_SOURCES += $(PRIVATE_MO_FILES)
$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
-$(PRIVATE_MO_FILES): $(intermediates)/xmlpool/%/LC_MESSAGES/options.mo: $(intermediates)/xmlpool/%.po
+$(PRIVATE_MO_FILES): $(intermediates)/xmlpool/%.gmo: $(intermediates)/xmlpool/%.po
mkdir -p $(dir $@)
msgfmt -o $@ $<