diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-12-04 18:49:54 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-12-04 18:54:10 +0000 |
| commit | 3c06c78d79fb21cd66ad1c4a4e47d593715d3442 (patch) | |
| tree | 5f5ffd056feea6a8a79b55721298d9d7ec0c1220 /src/prefix.cpp | |
| parent | Merge branch 'transupdate-master' of gitlab.com:Moini/inkscape (diff) | |
| parent | Fix a compiler warning (diff) | |
| download | inkscape-3c06c78d79fb21cd66ad1c4a4e47d593715d3442.tar.gz inkscape-3c06c78d79fb21cd66ad1c4a4e47d593715d3442.zip | |
Allow to set INKSCAPE_DATADIR via environment variable
INKSCAPE_DATADIR is the prefix prepended to all resource paths
(i.e. typically /share or similar on Linux system)
and typically set at compile time with the INKSCAPE_DATADIR define
(unless configured with ENABLE_BINRELOC)
This commit allows to override this default on Windows and Linux
(compiled without ENABLE_BINRELOC) by setting the environment
variable INKSCAPE_DATADIR.
Diffstat (limited to 'src/prefix.cpp')
| -rw-r--r-- | src/prefix.cpp | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/src/prefix.cpp b/src/prefix.cpp index c8bf7abec..14fdd04df 100644 --- a/src/prefix.cpp +++ b/src/prefix.cpp @@ -416,44 +416,4 @@ br_extract_prefix (const char *path) } #endif /* __cplusplus */ - - -#ifdef __WIN32__ -/** - * Provide a similar mechanism for Win32. Enable a macro, - * WIN32_DATADIR, that can look up subpaths for inkscape resources - */ - -/** - * Get the Windows-equivalent of INKSCAPE_DATADIR and append a relative path - * - * - by default INKSCAPE_DATADIR will be relative to the called executable - * (typically inkscape/share but also handles the case where the executable is in a /bin subfolder) - * - to override set the INKSCAPE_DATADIR environment variable - */ -char *win32_append_datadir(const char *relative_path) -{ - static gchar *datadir; - if (!datadir) { - gchar const *inkscape_datadir = g_getenv("INKSCAPE_DATADIR"); - if (inkscape_datadir) { - datadir = g_strdup(inkscape_datadir); - } else { - gchar *module_path = g_win32_get_package_installation_directory_of_module(NULL); - datadir = g_build_filename(module_path, "share", NULL); - g_free(module_path); - } - } - - if (!relative_path) { - relative_path = ""; - } - - return g_build_filename(datadir, relative_path, NULL); -} -#endif /* __WIN32__ */ - - - - #endif /* _PREFIX_C */ |
