Fix build-time hard-coded path introduced by the guile2 compile changes

These changes hardcoded the standards-reports path at build time.
On Windows and OS X the final path is only known at installation time.
So after installation the build-time hard-coded path would be invalid and
the standard-reports directory could no longer be found.
This commit is contained in:
Geert Janssens 2014-11-17 14:01:07 +01:00
parent 64d9a3b99e
commit 22490a37ab

View File

@ -162,8 +162,18 @@ gchar *gnc_path_get_reportdir()
}
else
{
/* Careful: if the autoconf macro GNC_SCM_INSTALL_DIR gets changed
* in configure.ac, this path should probably change as well.
* Currently this code assumes GNC_SCM_INSTALL_DIR is set to
* pkgdatadir/scm
* We can't use the AC_MACRO GNC_SCM_INSTALL_DIR here directly
* because that's expanded at build time. On Windows and OS X
* the final path may get installed in a different location
* than assumed during build, invalidating the build path at
* runtime.
*/
gchar *pkgdatadir = gnc_path_get_pkgdatadir ();
result = g_build_filename (GNC_SCM_INSTALL_DIR,
result = g_build_filename (pkgdatadir, "scm",
"gnucash", "report", (char*)NULL);
g_free (pkgdatadir);
}