[gnome-control-center] datetime: Fix timezone-gfx test with builddir != srcdir
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] datetime: Fix timezone-gfx test with builddir != srcdir
- Date: Tue, 13 Sep 2016 10:42:28 +0000 (UTC)
commit 1ff213fd18fac566ff1001972a7d17a8c9854298
Author: Bastien Nocera <hadess hadess net>
Date: Tue Sep 13 12:34:13 2016 +0200
datetime: Fix timezone-gfx test with builddir != srcdir
panels/datetime/Makefile.am | 2 +-
panels/datetime/test-timezone-gfx.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
index 4fc533e..43523a6 100644
--- a/panels/datetime/Makefile.am
+++ b/panels/datetime/Makefile.am
@@ -35,7 +35,7 @@ test_timezone_CFLAGS = $(DATETIME_PANEL_CFLAGS)
test_timezone_gfx_SOURCES = test-timezone-gfx.c tz.c tz.h cc-datetime-resources.c cc-datetime-resources.h
test_timezone_gfx_LDADD = $(DATETIME_PANEL_LIBS) -lm
-test_timezone_gfx_CFLAGS = $(DATETIME_PANEL_CFLAGS)
+test_timezone_gfx_CFLAGS = $(DATETIME_PANEL_CFLAGS) -DSRCDIR="\"$(srcdir)\""
test_endianess_SOURCES = test-endianess.c date-endian.c date-endian.h
test_endianess_LDADD = $(DATETIME_PANEL_LIBS)
diff --git a/panels/datetime/test-timezone-gfx.c b/panels/datetime/test-timezone-gfx.c
index debe9e4..529b7f0 100644
--- a/panels/datetime/test-timezone-gfx.c
+++ b/panels/datetime/test-timezone-gfx.c
@@ -52,7 +52,7 @@ int main (int argc, char **argv)
if (argc == 2) {
pixmap_dir = g_strdup (argv[1]);
} else if (argc == 1) {
- pixmap_dir = g_strdup ("data/");
+ pixmap_dir = g_strdup (SRCDIR "/data/");
} else {
g_message ("Usage: %s [PIXMAP DIRECTORY]", argv[0]);
return 1;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]