aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--po/Makefile.in.in11
-rw-r--r--tests/config.vala.in1
-rw-r--r--tests/indicator-keyboard-test.in1
-rw-r--r--tests/main.vala4
4 files changed, 11 insertions, 6 deletions
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 06a8cfe9..fcd2c3b7 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -33,8 +33,7 @@ exec_prefix = @exec_prefix@
datadir = @datadir@
datarootdir = @datarootdir@
libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = @localedir@
subdir = po
install_sh = @install_sh@
# Automake >= 1.8 provides @mkdir_p@.
@@ -80,7 +79,7 @@ INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@;
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
- $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+ $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox
.po.mo:
$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
@@ -108,7 +107,7 @@ install-data-no: all
install-data-yes: all
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+ dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
$(mkdir_p) $$dir; \
if test -r $$lang.gmo; then \
$(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -142,8 +141,8 @@ install-exec installcheck:
uninstall:
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
check: all $(GETTEXT_PACKAGE).pot
diff --git a/tests/config.vala.in b/tests/config.vala.in
index 7acae9de..ef533d33 100644
--- a/tests/config.vala.in
+++ b/tests/config.vala.in
@@ -1,2 +1,3 @@
const string DCONF_PROFILE = "@abs_top_builddir@/tests/profiles/indicator-keyboard-test";
const string SERVICE_DIR = "@abs_top_builddir@/tests/services";
+const string XDG_RUNTIME_DIR = "@abs_top_builddir@/tests";
diff --git a/tests/indicator-keyboard-test.in b/tests/indicator-keyboard-test.in
index 3d43d8ab..8c20f6bf 100644
--- a/tests/indicator-keyboard-test.in
+++ b/tests/indicator-keyboard-test.in
@@ -5,6 +5,7 @@ export DCONF_PROFILE="@abs_top_builddir@/tests/profiles/indicator-keyboard-test"
export GSETTINGS_SCHEMA_DIR="@abs_top_builddir@/data"
export XDG_RUNTIME_DIR="@abs_top_builddir@/tests"
export GTK_IM_MODULE="ibus"
+export GDK_BACKEND="x11"
if xvfb-run -a ./indicator-keyboard-tests
then
diff --git a/tests/main.vala b/tests/main.vala
index dca3b8b2..e2782d1d 100644
--- a/tests/main.vala
+++ b/tests/main.vala
@@ -77,6 +77,8 @@ public class Tests : Object, Fixture {
((!) _bus).add_service_dir (SERVICE_DIR);
((!) _bus).up ();
+ Environment.set_variable ("XDG_RUNTIME_DIR", XDG_RUNTIME_DIR, true);
+
var loop = new MainLoop (null, false);
_service_name = Bus.own_name (BusType.SESSION,
@@ -130,6 +132,8 @@ public class Tests : Object, Fixture {
if (_bus != null) {
((!) _bus).down ();
_bus = null;
+
+ Environment.set_variable ("XDG_RUNTIME_DIR", XDG_RUNTIME_DIR, true);
}
}