[rhythmbox] build: Fix plugins not finding their data in jhbuild
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] build: Fix plugins not finding their data in jhbuild
- Date: Mon, 13 Jun 2016 22:22:24 +0000 (UTC)
commit 8738f0d483a1e9602702858966a3a4da444d9401
Author: Bastien Nocera <hadess hadess net>
Date: Thu Jun 9 17:04:33 2016 +0200
build: Fix plugins not finding their data in jhbuild
Now that jhbuild launches configure from a different builddir, `pwd`
isn't the root of the source tree, but the builddir. Using `dirname $0`
instead means that ROOT_UNINSTALLED_DIR will be the source tree instead
of the builddir.
https://bugzilla.gnome.org/show_bug.cgi?id=767456
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e7a03a6..fa598f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -457,8 +457,8 @@ AC_ARG_ENABLE(uninstalled-build,
if test x"$enable_uninstalled" = xyes; then
AC_DEFINE(USE_UNINSTALLED_DIRS, 1, [Define to look for files in source tree locations])
fi
-ROOT_UNINSTALLED_DIR="`pwd`"
-AC_DEFINE_UNQUOTED(SHARE_UNINSTALLED_DIR,"`pwd`/$srcdir/data",[path to source data dir])
+ROOT_UNINSTALLED_DIR="`dirname $0`"
+AC_DEFINE_UNQUOTED(SHARE_UNINSTALLED_DIR,"`dirname $0`/$srcdir/data",[path to source data dir])
AC_DEFINE_UNQUOTED(SHARE_UNINSTALLED_BUILDDIR,"`pwd`/data",[path to built source data dir])
AC_DEFINE_UNQUOTED(METADATA_UNINSTALLED_DIR,"`pwd`/metadata",[path to metadata build dir])
AC_SUBST(ROOT_UNINSTALLED_DIR)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]