aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-05-16 17:21:21 +0800
committerXan Lopez <xan@igalia.com>2012-05-16 17:21:21 +0800
commit54a3122d8626f78338033a704d5849738f6dd2e6 (patch)
tree8f96cd20d38231319f1c54db523227b01cb16c1d
parent0f356e2c1eb200fd286b468bf0c7adc4b232d9a0 (diff)
downloadgsoc2013-epiphany-54a3122d8626f78338033a704d5849738f6dd2e6.tar.gz
gsoc2013-epiphany-54a3122d8626f78338033a704d5849738f6dd2e6.tar.zst
gsoc2013-epiphany-54a3122d8626f78338033a704d5849738f6dd2e6.zip
ephy-profile-utils: use absolute path for build dir
That way we can run the tests from any directory in debug mode.
-rw-r--r--lib/Makefile.am12
-rw-r--r--lib/ephy-profile-utils.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 601c79a6c..7e5ba5537 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -82,12 +82,12 @@ nodist_libephymisc_la_SOURCES = \
$(BUILT_SOURCES)
libephymisc_la_CPPFLAGS = \
- -I$(top_builddir)/lib \
- -I$(top_srcdir)/lib/egg \
- -DDATADIR="\"$(datadir)\"" \
- -DSHARE_DIR=\"$(pkgdatadir)\" \
- -DTOP_SRC_DATADIR=\"$(top_srcdir)/data\" \
- -DTOP_BUILD_DIR=\"$(top_builddir)\" \
+ -I$(top_builddir)/lib \
+ -I$(top_srcdir)/lib/egg \
+ -DDATADIR="\"$(datadir)\"" \
+ -DSHARE_DIR=\"$(pkgdatadir)\" \
+ -DTOP_SRC_DATADIR=\"$(top_srcdir)/data\" \
+ -DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \
-DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_API_VERSION)/extensions"\" \
$(AM_CPPFLAGS)
diff --git a/lib/ephy-profile-utils.c b/lib/ephy-profile-utils.c
index 297159eef..53d8dd8e7 100644
--- a/lib/ephy-profile-utils.c
+++ b/lib/ephy-profile-utils.c
@@ -210,7 +210,7 @@ ephy_profile_utils_do_migration (int test_to_run, gboolean debug)
}
if (debug)
- argv[0] = TOP_BUILD_DIR"/lib/"EPHY_PROFILE_MIGRATOR;
+ argv[0] = ABS_TOP_BUILD_DIR"/lib/"EPHY_PROFILE_MIGRATOR;
ret = g_spawn_sync (NULL, argv, envp, G_SPAWN_SEARCH_PATH,
NULL, NULL, NULL, NULL,