[evolution-rss] Bug 654591 - do not hardcode path to evolution



commit 44a2e7f1d4a13ed71ab235052a8497f6f053cf0d
Author: Lucian Langa <lucilanga gnome org>
Date:   Sat Jul 16 15:22:56 2011 +0300

    Bug 654591 - do not hardcode path to evolution

 src/Makefile.am            |    1 +
 src/evolution-import-rss.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 1fdd6fc..75b305b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,6 +11,7 @@ INCLUDES =							\
 	-DEVOLUTION_VERSION_STRING=\"$(EVOLUTION_EXEC_VERSION)\"\
 	-DEVOLUTION_VERSION=$(evolution_version_int)		\
 	-DDATASERVER_VERSION=$(DATASERVER_VERSION)		\
+	-DEVOLUTION_BINDIR=\""$(exec_prefix)"\"			\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"			\
 	-DEVOLUTION_ICONDIR=\""$(ICON_DIR)"\"			\
 	-DLIBSOUP_VERSION="$(SOUP_VERSION)"			\
diff --git a/src/evolution-import-rss.c b/src/evolution-import-rss.c
index 44027b1..bdd5325 100644
--- a/src/evolution-import-rss.c
+++ b/src/evolution-import-rss.c
@@ -33,7 +33,7 @@
 #include <gio/gio.h>
 
 #define d(x)
-#define EVOLUTION "/opt/gnome-dev/bin/evolution&"
+#define EVOLUTION EVOLUTION_BINDIR"/bin/evolution&"
 
 #define RSS_DBUS_PATH "/org/gnome/feed/Reader"
 #define RSS_DBUS_SERVICE "org.gnome.feed.Reader"



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