Skip to content

build: prepare for FHS, where GISBASE is not the absolute truth OSGeo/grass#5630 EXTRA FIXES #731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
echoix wants to merge 20 commits into
base: main
Choose a base branch
from
+681 −235
Open

build: prepare for FHS, where GISBASE is not the absolute truth OSGeo/grass#5630 EXTRA FIXES #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b8e081f
build: new specific env vars for FHS, replacing GISBASE
nilason Mar 26, 2025
27b9528
correct bad rebase
nilason Jul 28, 2025
ff20546
Avoid list of variables in the constructor and in the methods, replac…
wenzeslaus Oct 9, 2025
83fac85
Manually sync to version of RuntimePaths from #6482
wenzeslaus Oct 10, 2025
bd80789
Merge branch 'main' into fix_cmake_share_dir
wenzeslaus Oct 18, 2025
9cc3fb5
Fix and add missing lines from merge
wenzeslaus Oct 18, 2025
268cbcd
Pass the initial path to setup runtime as done on main (relevant when…
wenzeslaus Oct 18, 2025
cfd4dfe
Always fail when g.proj gives non-zero return code (should be moved t…
wenzeslaus Oct 18, 2025
faaa537
Merge branch 'main' into fix_cmake_share_dir
nilason May 7, 2026
8de4c5e
Merge branch 'main' into fix_cmake_share_dir
nilason Jun 15, 2026
d03ad09
add GRASS_MISCDIR for locale/grass_po_stats.py; fix install dir for f…
nilason Jun 15, 2026
2ee5faa
libgis: Avoid infinite recursion in G_init_locale on missing variable
wenzeslaus Jul 4, 2026
d7bfb58
Merge branch 'main' into fix_cmake_share_dir
nilason Jul 15, 2026
ac66932
Merge branch 'main' into pr/nilason/5630
echoix Jul 17, 2026
337330c
Merge branch 'main' into fix_cmake_share_dir
nilason Jul 18, 2026
0da3a17
Merge branch 'main' into fix_cmake_share_dir
nilason Aug 21, 2026
77395bd
Merge branch 'main' into fix_cmake_share_dir
nilason Sep 29, 2026
a3de85e
Merge branch 'main' into fix_cmake_share_dir
nilason Oct 7, 2026
8af2d2a
grass.script: Set up resource paths when only GISBASE is set
claude Oct 10, 2026
3c8cf2d
libgis: Fall back to GISBASE for unset resource directories
claude Oct 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 37 additions & 36 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,38 +213,11 @@ if(WITH_FHS)
${RUNTIME_GISBASE}/demolocation
SYMBOLIC
)
file(
CREATE_LINK ${OUTDIR}/${GRASS_INSTALL_FONTSDIR} ${RUNTIME_GISBASE}/fonts
SYMBOLIC
)
file(
CREATE_LINK
${OUTDIR}/${GRASS_INSTALL_ETCDIR}/colors
${RUNTIME_GISBASE}/etc/colors
SYMBOLIC
)
file(
CREATE_LINK
${OUTDIR}/${GRASS_INSTALL_ETCDIR}/colors.desc
${RUNTIME_GISBASE}/etc/colors.desc
SYMBOLIC
)
file(MAKE_DIRECTORY "${RUNTIME_GISBASE}/gui/wxpython")
file(
CREATE_LINK
${OUTDIR}/${GRASS_INSTALL_ETCDIR}/element_list
${RUNTIME_GISBASE}/etc/element_list
SYMBOLIC
)
file(
CREATE_LINK
${OUTDIR}/${GRASS_INSTALL_ETCDIR}/renamed_options
${RUNTIME_GISBASE}/etc/renamed_options
SYMBOLIC
)
file(
CREATE_LINK
${OUTDIR}/${GRASS_INSTALL_ETCDIR}/VERSIONNUMBER
${RUNTIME_GISBASE}/etc/VERSIONNUMBER
${OUTDIR}/${GRASS_INSTALL_GUIDIR}/wxpython/xml
${RUNTIME_GISBASE}/gui/wxpython/xml
SYMBOLIC
)
endif()
Expand Down Expand Up @@ -290,6 +263,17 @@ if(WIN32)
"GISRC=${GISRC}"
"LC_ALL=C"
"LANG=C"
"GRASS_COLORSDIR=${RUNTIME_GRASS_COLORSDIR}"
"GRASS_DOCDIR=${RUNTIME_GRASS_DOCDIR}"
"GRASS_ETCDIR=${RUNTIME_GRASS_ETCDIR}"
"GRASS_FONTSDIR=${RUNTIME_GRASS_FONTSDIR}"
"GRASS_GRAPHICSDIR=${RUNTIME_GRASS_GRAPHICSDIR}"
"GRASS_GUIRESDIR=${RUNTIME_GRASS_GUIRESDIR}"
"GRASS_GUISCRIPTDIR=${RUNTIME_GRASS_GUISCRIPTDIR}"
"GRASS_GUIWXDIR=${GUI_WXPYTHON_DIR}"
"GRASS_LOCALEDIR=${RUNTIME_GRASS_LOCALEDIR}"
"GRASS_MISCDIR=${RUNTIME_GRASS_MISCDIR}"
"GRASS_MKDOCSDIR=${RUNTIME_GRASS_MKDOCSDIR}"
"ARCH=${BUILD_ARCH}"
"ARCH_DISTDIR=${RUN_GISBASE_NATIVE}"
"LANGUAGE=C"
Expand All @@ -314,6 +298,17 @@ else()
"GISRC=${GISRC}"
"LC_ALL=C"
"LANG=C"
"GRASS_COLORSDIR=${RUNTIME_GRASS_COLORSDIR}"
"GRASS_DOCDIR=${RUNTIME_GRASS_DOCDIR}"
"GRASS_ETCDIR=${RUNTIME_GRASS_ETCDIR}"
"GRASS_FONTSDIR=${RUNTIME_GRASS_FONTSDIR}"
"GRASS_GRAPHICSDIR=${RUNTIME_GRASS_GRAPHICSDIR}"
"GRASS_GUIRESDIR=${RUNTIME_GRASS_GUIRESDIR}"
"GRASS_GUISCRIPTDIR=${RUNTIME_GRASS_GUISCRIPTDIR}"
"GRASS_GUIWXDIR=${GUI_WXPYTHON_DIR}"
"GRASS_LOCALEDIR=${RUNTIME_GRASS_LOCALEDIR}"
"GRASS_MISCDIR=${RUNTIME_GRASS_MISCDIR}"
"GRASS_MKDOCSDIR=${RUNTIME_GRASS_MKDOCSDIR}"
"ARCH=${BUILD_ARCH}"
"ARCH_DISTDIR=${RUN_GISBASE_NATIVE}"
"LANGUAGE=C"
Expand Down Expand Up @@ -392,23 +387,29 @@ add_custom_target(
ALL
COMMAND
${CMAKE_COMMAND} -E make_directory
${OUTDIR}/${GRASS_INSTALL_DOCDIR}/colortables
${OUTDIR}/${GRASS_INSTALL_GRAPHICSDIR}/colortables
COMMAND
${grass_env_command} ${PYTHON_EXECUTABLE} ${THUMBNAILS_PY}
${OUTDIR}/${GRASS_INSTALL_DOCDIR}/colortables
${OUTDIR}/${GRASS_INSTALL_GRAPHICSDIR}/colortables
COMMAND
${CMAKE_COMMAND} -E copy_directory
${OUTDIR}/${GRASS_INSTALL_DOCDIR}/colortables
${OUTDIR}/${GRASS_INSTALL_GRAPHICSDIR}/colortables
${OUTDIR}/${GRASS_INSTALL_MKDOCSDIR}/source/colortables
BYPRODUCTS ${OUTDIR}/${GRASS_INSTALL_DOCDIR}/colortables
BYPRODUCTS ${OUTDIR}/${GRASS_INSTALL_GRAPHICSDIR}/colortables
COMMENT "Creating thumbnails"
DEPENDS ALL_MODULES
)
set_target_properties(r_colors_thumbnails PROPERTIES FOLDER Misc)
install(
DIRECTORY ${OUTDIR}/${GRASS_INSTALL_DOCDIR}/colortables
DESTINATION ${GRASS_INSTALL_DOCDIR}
DIRECTORY ${OUTDIR}/${GRASS_INSTALL_GRAPHICSDIR}/colortables
DESTINATION ${GRASS_INSTALL_GRAPHICSDIR}
)
if(WITH_FHS AND WITH_DOCS)
install(
DIRECTORY ${OUTDIR}/${GRASS_INSTALL_GRAPHICSDIR}/colortables
DESTINATION ${GRASS_INSTALL_DOCDIR}
)
endif()

set(misc_files
AUTHORS
Expand Down
38 changes: 37 additions & 1 deletion cmake/modules/GRASSInstallDirs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,12 @@ if(WITH_FHS)
)
set(GRASS_INSTALL_DEMODIR "${GRASS_INSTALL_SHAREDIR}/demolocation")
set(GRASS_INSTALL_MISCDIR "${GRASS_INSTALL_SHAREDIR}")
set(GRASS_INSTALL_DEMODIR "${GRASS_INSTALL_MISCDIR}/demolocation")
set(GRASS_INSTALL_MAKEFILEDIR "${GISBASE_DIR}/Make")
set(GRASS_INSTALL_LOCALEDIR "${CMAKE_INSTALL_LOCALEDIR}")
set(GRASS_INSTALL_COLORSDIR "${GRASS_INSTALL_ETCDIR}/colors")
set(GRASS_INSTALL_GRAPHICSDIR "${GRASS_INSTALL_ETCDIR}/graphics")
set(GRASS_INSTALL_GRASS_GUIWXDIR "${GRASS_INSTALL_GUIDIR}/wxpython")
else()
message("Legacy file structure")
set(GISBASE_DIR
Expand All @@ -54,10 +58,13 @@ else()
set(GRASS_INSTALL_DEVDOCDIR "${GISBASE_DIR}/html")
set(GRASS_INSTALL_MANDIR "${GISBASE_DIR}/docs/man/man1")
set(GRASS_INSTALL_MKDOCSDIR "${GISBASE_DIR}/docs/mkdocs")
set(GRASS_INSTALL_DEMODIR "${GISBASE_DIR}/demolocation")
set(GRASS_INSTALL_MISCDIR "${GISBASE_DIR}")
set(GRASS_INSTALL_DEMODIR "${GRASS_INSTALL_MISCDIR}/demolocation")
set(GRASS_INSTALL_MAKEFILEDIR "${GISBASE_DIR}/Make")
set(GRASS_INSTALL_LOCALEDIR "${GISBASE_DIR}/locale")
set(GRASS_INSTALL_COLORSDIR "${GRASS_INSTALL_ETCDIR}/colors")
set(GRASS_INSTALL_GRAPHICSDIR "${GRASS_INSTALL_DOCDIR}")
set(GRASS_INSTALL_GRASS_GUIWXDIR "${GRASS_INSTALL_GUIDIR}/wxpython")
endif()

set(GRASS_INSTALL_CMAKECONFDIR "${CMAKE_INSTALL_LIBDIR}/cmake")
Expand Down Expand Up @@ -85,12 +92,41 @@ message(STATUS "GRASS_INSTALL_DEMODIR ${GRASS_INSTALL_DEMODIR}")
message(STATUS "GRASS_INSTALL_MISCDIR ${GRASS_INSTALL_MISCDIR}")
message(STATUS "GRASS_INSTALL_MAKEFILEDIR ${GRASS_INSTALL_MAKEFILEDIR}")
message(STATUS "GRASS_INSTALL_LOCALEDIR ${GRASS_INSTALL_LOCALEDIR}")
message(STATUS "GRASS_INSTALL_COLORSDIR ${GRASS_INSTALL_COLORSDIR}")
message(STATUS "GRASS_INSTALL_GRAPHICSDIR ${GRASS_INSTALL_GRAPHICSDIR}")
message(STATUS "GRASS_INSTALL_GRASS_GUIWXDIR ${GRASS_INSTALL_GRASS_GUIWXDIR}")
message(STATUS "GRASS_INSTALL_CMAKECONFDIR ${GRASS_INSTALL_CMAKECONFDIR}")
message(STATUS "GRASS_INSTALL_CMAKEMODULEDIR ${GRASS_INSTALL_CMAKEMODULEDIR}")

set(OUTDIR "${CMAKE_BINARY_DIR}/output")
set(GISBASE ${CMAKE_INSTALL_PREFIX}/${GISBASE_DIR})

set(GRASS_LOCALEDIR "${GRASS_INSTALL_LOCALEDIR}")
set(GRASS_GUIRESDIR "${GRASS_INSTALL_GUIDIR}")
set(GRASS_GUISCRIPTDIR "${GRASS_INSTALL_GUISCRIPTDIR}")
set(GRASS_DOCDIR "${GRASS_INSTALL_DOCDIR}")
set(GRASS_MKDOCSDIR "${GRASS_INSTALL_MKDOCSDIR}")
set(GRASS_FONTSDIR "${GRASS_INSTALL_FONTSDIR}")
set(GRASS_COLORSDIR "${GRASS_INSTALL_COLORSDIR}")
set(GRASS_GRAPHICSDIR "${GRASS_INSTALL_GRAPHICSDIR}")
set(GRASS_ETCDIR "${GRASS_INSTALL_ETCDIR}")
set(GRASS_ETCBINDIR "${GRASS_INSTALL_ETCBINDIR}")
set(GRASS_PYDIR "${GRASS_INSTALL_PYDIR}")
set(GRASS_GUIWXDIR "${GRASS_INSTALL_GRASS_GUIWXDIR}")
set(GRASS_MISCDIR "${GRASS_INSTALL_MISCDIR}")

set(RUNTIME_GISBASE "${OUTDIR}/${GISBASE_DIR}")
set(RUNTIME_GRASS_LOCALEDIR "${OUTDIR}/${GRASS_INSTALL_LOCALEDIR}")
set(RUNTIME_GRASS_GUIRESDIR "${OUTDIR}/${GRASS_INSTALL_GUIDIR}")
set(RUNTIME_GRASS_GUISCRIPTDIR "${OUTDIR}/${GRASS_INSTALL_GUISCRIPTDIR}")
set(RUNTIME_GRASS_DOCDIR "${OUTDIR}/${GRASS_INSTALL_DOCDIR}")
set(RUNTIME_GRASS_MISCDIR "${OUTDIR}/${GRASS_INSTALL_MISCDIR}")
set(RUNTIME_GRASS_MKDOCSDIR "${OUTDIR}/${GRASS_INSTALL_MKDOCSDIR}")
set(RUNTIME_GRASS_FONTSDIR "${OUTDIR}/${GRASS_INSTALL_FONTSDIR}")
set(RUNTIME_GRASS_COLORSDIR "${OUTDIR}/${GRASS_INSTALL_COLORSDIR}")
set(RUNTIME_GRASS_GRAPHICSDIR "${OUTDIR}/${GRASS_INSTALL_GRAPHICSDIR}")
set(RUNTIME_GRASS_ETCDIR "${OUTDIR}/${GRASS_INSTALL_ETCDIR}")

set(GISRC_NAME ".grassrc${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}")

if(WITH_FHS)
Expand Down
26 changes: 19 additions & 7 deletions display/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,28 @@ add_custom_command(
POST_BUILD
COMMAND
${CMAKE_COMMAND} -E make_directory
${OUTDIR}/${GRASS_INSTALL_DOCDIR}/barscales
${OUTDIR}/${GRASS_INSTALL_GRAPHICSDIR}/barscales
COMMAND
${CMAKE_COMMAND} -E copy ${d_barscale_png}
${OUTDIR}/${GRASS_INSTALL_DOCDIR}/barscales
${OUTDIR}/${GRASS_INSTALL_GRAPHICSDIR}/barscales
COMMAND
${CMAKE_COMMAND} -E make_directory
${OUTDIR}/${GRASS_INSTALL_MKDOCSDIR}/source/barscales
COMMAND
${CMAKE_COMMAND} -E copy ${d_barscale_png}
${OUTDIR}/${GRASS_INSTALL_MKDOCSDIR}/source/barscales
BYPRODUCTS ${OUTDIR}/${GRASS_INSTALL_DOCDIR}/barscales
BYPRODUCTS ${OUTDIR}/${GRASS_INSTALL_GRAPHICSDIR}/barscales
)
install(
DIRECTORY ${OUTDIR}/${GRASS_INSTALL_DOCDIR}/barscales
DESTINATION ${GRASS_INSTALL_DOCDIR}
DIRECTORY ${OUTDIR}/${GRASS_INSTALL_GRAPHICSDIR}/barscales
DESTINATION ${GRASS_INSTALL_GRAPHICSDIR}
)
if(WITH_FHS AND WITH_DOCS)
install(
DIRECTORY ${OUTDIR}/${GRASS_INSTALL_GRAPHICSDIR}/barscales
DESTINATION ${GRASS_INSTALL_DOCDIR}
)
endif()

build_program_in_subdir(
d.colorlist
Expand Down Expand Up @@ -156,9 +162,15 @@ if(WITH_DOCS)
DESTINATION ${OUTDIR}/${GRASS_INSTALL_MKDOCSDIR}/source/northarrows
)
install(
DIRECTORY ${OUTDIR}/${GRASS_INSTALL_DOCDIR}/northarrows
DESTINATION ${GRASS_INSTALL_DOCDIR}
DIRECTORY ${OUTDIR}/${GRASS_INSTALL_GRAPHICSDIR}/northarrows
DESTINATION ${GRASS_INSTALL_GRAPHICSDIR}
)
if(WITH_FHS)
install(
DIRECTORY ${OUTDIR}/${GRASS_INSTALL_GRAPHICSDIR}/northarrows
DESTINATION ${GRASS_INSTALL_DOCDIR}
)
endif()
endif()
build_program_in_subdir(d.path DEPENDS grass_gis grass_display grass_vector)
build_program_in_subdir(
Expand Down
4 changes: 2 additions & 2 deletions display/d.linegraph/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ static char *icon_files(void)

list = NULL;
len = 0;
snprintf(path, sizeof(path), "%s/etc/symbol", G_gisbase());
snprintf(path, sizeof(path), "%s/symbol", G_etc_dir());

dir = opendir(path);
if (!dir)
Expand All @@ -99,7 +99,7 @@ static char *icon_files(void)
if (d->d_name[0] == '.')
continue;

snprintf(path_i, sizeof(path_i), "%s/etc/symbol/%s", G_gisbase(),
snprintf(path_i, sizeof(path_i), "%s/symbol/%s", G_etc_dir(),
d->d_name);
dir_i = opendir(path_i);

Expand Down
12 changes: 8 additions & 4 deletions display/d.mon/start.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,12 @@ char *start_wx(const char *name, const char *element, int width, int height,
mapfile = (char *)G_malloc(GPATH_MAX);
mapfile[0] = '\0';

snprintf(progname, sizeof(progname), "%s/gui/wxpython/mapdisp/main.py",
G_gisbase());
const char *wxdir = getenv("GRASS_GUIWXDIR");
if (!wxdir)
G_fatal_error(_("Incomplete GRASS session: Variable '%s' not set"),
"GRASS_GUIWXDIR");

snprintf(progname, sizeof(progname), "%s/mapdisp/main.py", wxdir);
snprintf(str_width, sizeof(str_width), "%d", width);
snprintf(str_height, sizeof(str_height), "%d", height);

Expand Down Expand Up @@ -168,8 +172,8 @@ int start_mon(const char *name, const char *output, int select, int width,
leg_file = G_store(file_path);

/* create py file (renderer) */
snprintf(render_cmd_path, sizeof(render_cmd_path),
"%s/etc/d.mon/render_cmd.py", getenv("GISBASE"));
snprintf(render_cmd_path, sizeof(render_cmd_path), "%s/d.mon/render_cmd.py",
G_etcbin_dir());
G_file_name(file_path, mon_path, "render.py", G_mapset());
G_debug(1, "Monitor name=%s, pyfile = %s", name, file_path);
if (1 != G_copy_file(render_cmd_path, file_path))
Expand Down
4 changes: 2 additions & 2 deletions display/d.vect.thematic/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ static char *icon_files(void)

list = NULL;
len = 0;
snprintf(path, sizeof(path), "%s/etc/symbol", G_gisbase());
snprintf(path, sizeof(path), "%s/symbol", G_etc_dir());

dir = opendir(path);
if (!dir)
Expand All @@ -655,7 +655,7 @@ static char *icon_files(void)
if (d->d_name[0] == '.')
continue;

snprintf(path_i, sizeof(path_i), "%s/etc/symbol/%s", G_gisbase(),
snprintf(path_i, sizeof(path_i), "%s/symbol/%s", G_etc_dir(),
d->d_name);
dir_i = opendir(path_i);

Expand Down
4 changes: 2 additions & 2 deletions display/d.vect/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ char *icon_files(void)

list = NULL;
len = 0;
snprintf(path, sizeof(path), "%s/etc/symbol", G_gisbase());
snprintf(path, sizeof(path), "%s/symbol", G_etc_dir());

dir = opendir(path);
if (!dir)
Expand All @@ -544,7 +544,7 @@ char *icon_files(void)
if (d->d_name[0] == '.')
continue;

snprintf(path_i, sizeof(path_i), "%s/etc/symbol/%s", G_gisbase(),
snprintf(path_i, sizeof(path_i), "%s/symbol/%s", G_etc_dir(),
d->d_name);
dir_i = opendir(path_i);

Expand Down
2 changes: 1 addition & 1 deletion doc/examples/gui/wxpython/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

# this enables to run application standalone (> python example/frame.py )
if __name__ == "__main__":
sys.path.append(os.path.join(os.environ["GISBASE"], "etc", "gui", "wxpython"))
sys.path.append(os.environ["GRASS_GUIWXDIR"])

# i18n is taken care of in the grass library code.
# So we need to import it before any of the GUI code.
Expand Down
2 changes: 1 addition & 1 deletion doc/examples/gui/wxpython/g.gui.example.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import grass.script.core as gcore

if __name__ == "__main__":
wxbase = os.path.join(os.getenv("GISBASE"), "etc", "gui", "wxpython")
wxbase = os.environ["GRASS_GUIWXDIR"]
if wxbase not in sys.path:
sys.path.append(wxbase)

Expand Down
2 changes: 1 addition & 1 deletion general/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ build_program_in_subdir(
)
add_dependencies(g.mkfontcap fonts)

# TODO(FHS): revert GRASS_INSTALL_ETCBINDIR to GRASS_INSTALL_ETCDIR
# TODO(FHS): rewire ${OUTDIR} path to ${PREFIX} in installed version of fontcap
set(fontcap_file ${OUTDIR}/${GRASS_INSTALL_ETCBINDIR}/fontcap)

add_custom_command(
Expand Down
8 changes: 6 additions & 2 deletions general/g.gui/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,12 @@ int main(int argc, char *argv[])
exit(EXIT_SUCCESS);
}

snprintf(progname, sizeof(progname), "%s/gui/wxpython/wxgui.py",
G_gisbase());
const char *wxdir = getenv("GRASS_GUIWXDIR");
if (!wxdir)
G_fatal_error(_("Incomplete GRASS session: Variable '%s' not set"),
"GRASS_GUIWXDIR");

snprintf(progname, sizeof(progname), "%s/wxgui.py", wxdir);
if (access(progname, F_OK) == -1)
G_fatal_error(_("Your installation doesn't include GUI, exiting."));

Expand Down
2 changes: 1 addition & 1 deletion general/g.list/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ int main(int argc, char *argv[])
if (flag.full->answer) {
char lister[GPATH_MAX];

snprintf(lister, sizeof(lister), "%s/etc/lister/%s", G_gisbase(),
snprintf(lister, sizeof(lister), "%s/lister/%s", G_etcbin_dir(),
elem->element[0]);

G_debug(3, "lister CMD: %s", lister);
Expand Down
4 changes: 2 additions & 2 deletions general/g.mapset/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ int main(int argc, char *argv[])
if (!gis_lock)
G_fatal_error(_("Unable to read GIS_LOCK environment variable"));

G_asprintf(&lock_prog, "%s/etc/lock", G_gisbase());
G_asprintf(&lock_prog, "%s/lock", G_etc_dir());

snprintf(path, sizeof(path), "%s/.gislock", mapset_new_path);
G_debug(2, "%s", path);
Expand All @@ -265,7 +265,7 @@ int main(int argc, char *argv[])
}

/* Clean temporary directory */
snprintf(path, sizeof(path), "%s/etc/clean_temp", G_gisbase());
snprintf(path, sizeof(path), "%s/clean_temp", G_etcbin_dir());
G_verbose_message(_("Cleaning up temporary files..."));
G_spawn(path, "clean_temp", NULL);

Expand Down
Loading
Loading