Mercurial > geeqie
changeset 1640:97ac3a58adae
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
| author | nadvornik |
|---|---|
| date | Wed, 10 Jun 2009 20:26:47 +0000 |
| parents | 36a04d4bed60 |
| children | c8252313dcfa |
| files | configure.in plugins/rotate/Makefile.am plugins/symlink/Makefile.am src/main.c |
| diffstat | 4 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Tue Jun 09 19:12:37 2009 +0000 +++ b/configure.in Wed Jun 10 20:26:47 2009 +0000 @@ -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 # ----------------------------------------------------------------------
--- a/plugins/rotate/Makefile.am Tue Jun 09 19:12:37 2009 +0000 +++ b/plugins/rotate/Makefile.am Wed Jun 10 20:26:47 2009 +0000 @@ -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
--- a/plugins/symlink/Makefile.am Tue Jun 09 19:12:37 2009 +0000 +++ b/plugins/symlink/Makefile.am Wed Jun 10 20:26:47 2009 +0000 @@ -1,4 +1,4 @@ -dist_bin_SCRIPTS = geeqie-symlink +dist_pkglib_SCRIPTS = geeqie-symlink qq_desktopdir = $(pkgdatadir)/applications qq_desktop_DATA = symlink.desktop
--- a/src/main.c Tue Jun 09 19:12:37 2009 +0000 +++ b/src/main.c Wed Jun 10 20:26:47 2009 +0000 @@ -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();