From 3b6eaf03d1bb27ef42bd500a34799b82acf47c61 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Wed, 14 Mar 2012 15:58:33 +0100 Subject: Fix distcheck Most data files are listed through EXTRA_DIST, so they are left in the top srcdir during VPATH builds. The new EphyWebView unit test needs data/pages/error.html, so distcheck was broken because ephy_file ("error.html") was failing since it looked for them in $pwd/data. To fix this, look for files in the top srcdir instead of $pwd/data, which will lead to the builddir data data dir during distcheck. --- configure.ac | 7 ------- lib/Makefile.am | 1 + lib/ephy-file-helpers.c | 11 ++++++----- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index d2b3cf984..bafab26a3 100644 --- a/configure.ac +++ b/configure.ac @@ -235,13 +235,6 @@ fi AM_CONDITIONAL([ENABLE_ZEROCONF],[test "$enable_zeroconf" = "yes"]) -# ************ -# Misc defines -# ************ - -# uninstalled share dir to search data -AC_DEFINE_UNQUOTED([SHARE_UNINSTALLED_DIR], ["`pwd`/data"], [path to source data dir]) - # ******************************* # Add warning flags # ******************************* diff --git a/lib/Makefile.am b/lib/Makefile.am index c3965bd00..b98c70564 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -85,6 +85,7 @@ libephymisc_la_CPPFLAGS = \ -I$(top_srcdir)/lib/egg \ -DDATADIR="\"$(datadir)\"" \ -DSHARE_DIR=\"$(pkgdatadir)\" \ + -DTOP_SRC_DATADIR=\"$(top_srcdir)/data\" \ -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_API_VERSION)/extensions"\" \ $(AM_CPPFLAGS) diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c index 80d30e06d..7c3612be9 100644 --- a/lib/ephy-file-helpers.c +++ b/lib/ephy-file-helpers.c @@ -223,14 +223,15 @@ ephy_file (const char *filename) static const char * const paths[] = { #ifdef GNOME_ENABLE_DEBUG - SHARE_UNINSTALLED_DIR "/", - SHARE_UNINSTALLED_DIR "/glade/", - SHARE_UNINSTALLED_DIR "/ui/", - SHARE_UNINSTALLED_DIR "/art/", - SHARE_UNINSTALLED_DIR "/pages/", + TOP_SRC_DATADIR "/", + TOP_SRC_DATADIR "/glade/", + TOP_SRC_DATADIR "/ui/", + TOP_SRC_DATADIR "/art/", + TOP_SRC_DATADIR "/pages/", #endif SHARE_DIR "/", SHARE_DIR "/glade/", + SHARE_DIR "/ui/", SHARE_DIR "/art/", SHARE_DIR "/pages/" }; -- cgit v1.2.3