[epiphany] ephy-profile-utils: use absolute path for build dir
- From: Xan Lopez <xan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] ephy-profile-utils: use absolute path for build dir
- Date: Wed, 16 May 2012 09:21:44 +0000 (UTC)
commit 54a3122d8626f78338033a704d5849738f6dd2e6
Author: Xan Lopez <xan igalia com>
Date: Wed May 16 18:21:21 2012 +0900
ephy-profile-utils: use absolute path for build dir
That way we can run the tests from any directory in debug mode.
lib/Makefile.am | 12 ++++++------
lib/ephy-profile-utils.c | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 601c79a..7e5ba55 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 297159e..53d8dd8 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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]