[sound-juicer] Fix running in builddir when bulilddir != srcdir



commit 4d07f244de7e01b4c30fed6ea279dfd234bef66c
Author: Phillip Wood <phillip wood dunelm org uk>
Date:   Thu Feb 19 14:31:25 2015 +0000

    Fix running in builddir when bulilddir != srcdir
    
    Running sound-juicer from the build directory when builddir !== srcdir
    was broken as it was looking in the wrong place for the uninstalled ui
    and encoding profile files.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=744845

 Makefile.am                    |    1 +
 libjuicer/rb-gst-media-types.c |    2 +-
 src/sj-main.c                  |    4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 6508a59..06d343c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,7 @@ MAINTAINERCLEANFILES =
 sound_juicer_CPPFLAGS = \
        -I$(top_srcdir)/libjuicer \
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"  \
+       -DTOPSRCDIR=\""$(top_srcdir)"\" \
        -DDATADIR=\""$(datadir)"\" \
        -DPREFIX=\""$(prefix)"\" \
        -DLIBDIR=\""$(libdir)"\" \
diff --git a/libjuicer/rb-gst-media-types.c b/libjuicer/rb-gst-media-types.c
index 5400e10..6a73aad 100644
--- a/libjuicer/rb-gst-media-types.c
+++ b/libjuicer/rb-gst-media-types.c
@@ -34,7 +34,7 @@
 
 #include "rb-gst-media-types.h"
 
-#define SOURCE_ENCODING_TARGET_FILE "data/rhythmbox.gep"
+#define SOURCE_ENCODING_TARGET_FILE TOPSRCDIR"/data/rhythmbox.gep"
 #define INSTALLED_ENCODING_TARGET_FILE DATADIR"/sound-juicer/rhythmbox.gep"
 static GstEncodingTarget *default_target = NULL;
 
diff --git a/src/sj-main.c b/src/sj-main.c
index c075503..19c0673 100644
--- a/src/sj-main.c
+++ b/src/sj-main.c
@@ -118,9 +118,9 @@ static CellCbContext cell_editing_context;
 
 #define DEFAULT_PARANOIA 15
 #define RAISE_WINDOW "raise-window"
-#define SOURCE_BUILDER "data/sound-juicer.ui"
+#define SOURCE_BUILDER TOPSRCDIR"/data/sound-juicer.ui"
 #define INSTALLED_BUILDER DATADIR"/sound-juicer/sound-juicer.ui"
-#define SOURCE_MENU_BUILDER "data/sound-juicer-menu.ui"
+#define SOURCE_MENU_BUILDER TOPSRCDIR"/data/sound-juicer-menu.ui"
 #define INSTALLED_MENU_BUILDER DATADIR"/sound-juicer/sound-juicer-menu.ui"
 #define COMPOSER_ROW 2 /* Row of entry_table containing composer_entry */
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]