Revision: 1739
http://geeqie.svn.sourceforge.net/geeqie/?rev=1739&view=rev
Author: nadvornik
Date: 2009-06-10 20:26:47 +0000 (Wed, 10 Jun 2009)
Log Message:
-----------
do not install helper scripts into /usr/bin
- install the helper scripts into pkglibdir, that is /usr/lib/geeqie
- add the directory to $PATH on startup - the Exec line in desktop files
does not have to contain full path
fixes
https://sourceforge.net/tracker/?func=detail&aid=2801121&group_id=222125&atid=1054680
Modified Paths:
--------------
trunk/configure.in
trunk/plugins/rotate/Makefile.am
trunk/plugins/symlink/Makefile.am
trunk/src/main.c
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2009-06-09 19:12:37 UTC (rev 1738)
+++ trunk/configure.in 2009-06-10 20:26:47 UTC (rev 1739)
@@ -222,6 +222,9 @@
eval "eval appdir=${datadir}/${PACKAGE}"
AC_DEFINE_UNQUOTED([GQ_APP_DIR], "$appdir", [Location of application data])
+eval "eval gq_bindir=${prefix}/lib/${PACKAGE}"
+AC_DEFINE_UNQUOTED([GQ_BIN_DIR], "$gq_bindir", [Location of helper scripts and
executables])
+
# LIRC support
# ----------------------------------------------------------------------
Modified: trunk/plugins/rotate/Makefile.am
===================================================================
--- trunk/plugins/rotate/Makefile.am 2009-06-09 19:12:37 UTC (rev 1738)
+++ trunk/plugins/rotate/Makefile.am 2009-06-10 20:26:47 UTC (rev 1739)
@@ -1,4 +1,4 @@
-dist_bin_SCRIPTS = geeqie-rotate
+dist_pkglib_SCRIPTS = geeqie-rotate
qq_desktopdir = $(pkgdatadir)/applications
qq_desktop_DATA = rotate90.desktop rotate180.desktop rotate270.desktop
Modified: trunk/plugins/symlink/Makefile.am
===================================================================
--- trunk/plugins/symlink/Makefile.am 2009-06-09 19:12:37 UTC (rev 1738)
+++ trunk/plugins/symlink/Makefile.am 2009-06-10 20:26:47 UTC (rev 1739)
@@ -1,4 +1,4 @@
-dist_bin_SCRIPTS = geeqie-symlink
+dist_pkglib_SCRIPTS = geeqie-symlink
qq_desktopdir = $(pkgdatadir)/applications
qq_desktop_DATA = symlink.desktop
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2009-06-09 19:12:37 UTC (rev 1738)
+++ trunk/src/main.c 2009-06-10 20:26:47 UTC (rev 1739)
@@ -446,6 +446,14 @@
#define RC_HISTORY_NAME "history"
+static void setup_env_path(void)
+{
+ const gchar *old_path = g_getenv("PATH");
+ gchar *path = g_strconcat(GQ_BIN_DIR, ":", old_path, NULL);
+ g_setenv("PATH", path, TRUE);
+ g_free(path);
+}
+
static void keys_load(void)
{
gchar *path;
@@ -785,6 +793,8 @@
mkdir_if_not_exists(get_thumbnails_cache_dir());
mkdir_if_not_exists(get_metadata_cache_dir());
+ setup_env_path();
+
keys_load();
accel_map_load();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
