dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 722939 - asking for an absolute path as gimpdir results in a path... 

...relative to the home folder

If an absolute path was given to the --with-gimpdir configure option,
use that path literally.
This commit is contained in:
Michael Natterer 2014-01-25 19:01:46 +01:00
parent e8a180c0d5
commit 6e07c83978
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1946,7 +1946,7 @@ AM_CONDITIONAL(ENABLE_GIMP_CONSOLE, test "x$enable_gimp_console" != xno)
# Possibly change default gimpdir from .gimp-major.minor
gimpdir=GIMP
AC_ARG_WITH(gimpdir, [ --with-gimpdir=DIR change default gimpdir from $XDG_CONFIG_HOME/GIMP/gimp_user_version to $XDG_CONFIG_HOME/DIR/gimp_user_version],
AC_ARG_WITH(gimpdir, [ --with-gimpdir=DIR change default gimpdir from $XDG_CONFIG_HOME/GIMP/gimp_user_version to $XDG_CONFIG_HOME/DIR/gimp_user_version, or to DIR if DIR is an absolute path],
if eval "test x$with_gimpdir != x"; then
if eval "test x$with_gimpdir != xyes"; then
gimpdir=$with_gimpdir

4
libgimpbase/gimpenv.c
View File

@ -251,6 +251,10 @@ gimp_directory (void)
gimp_dir = g_build_filename (gimp_data_directory (), env_gimp_dir, NULL);
}
}
else if (g_path_is_absolute (GIMPDIR))
{
gimp_dir = g_strdup (GIMPDIR);
}
else
{
#ifdef PLATFORM_OSX