IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bug 797674 - 3.9: test-gnc-path-util failed on Debian amd64

Browse Source
This commit is contained in:
John Ralls 2020-04-11 14:23:27 -07:00
parent 6ac309a92f
commit c91fb77fae
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libgnucash/core-utils/binreloc.c
View File

@ -469,23 +469,26 @@ gnc_gbr_find_prefix (const gchar *default_prefix)
static gchar*
find_component_directory (const gchar *default_dir, const gchar* compiled_dir)
{
gchar *prefix = NULL, *dir = NULL, *subdir = NULL;
gchar *prefix = NULL, *dir = NULL;
gchar *subdir = gnc_file_path_relative_part(PREFIX, compiled_dir);
prefix = gnc_gbr_find_prefix (NULL);
if (prefix == NULL)
return g_strdup (default_dir ? default_dir : compiled_dir);
else if (!g_strcmp0 (prefix, PREFIX))
return g_strdup (compiled_dir);
subdir = gnc_file_path_relative_part(PREFIX, compiled_dir);
if (g_strcmp0 (compiled_dir, subdir) == 0)
if (!g_getenv("GNC_UNINSTALLE"))
{
/* compiled_dir isn't a subdir of PREFIX. This isn't relocatable so
* return compiled_dir.
*/
g_free (subdir);
g_free (prefix);
return g_strdup (compiled_dir);
if (!g_strcmp0 (prefix, PREFIX))
return g_strdup (compiled_dir);
if (g_strcmp0 (compiled_dir, subdir) == 0)
{
/* compiled_dir isn't a subdir of PREFIX. This isn't relocatable so
* return compiled_dir.
*/
g_free (subdir);
g_free (prefix);
return g_strdup (compiled_dir);
}
}
dir = g_build_filename (prefix, subdir, NULL);
g_free (subdir);