pmodules/Pmodules
1
0
Fork 0
mirror of https://github.com/Pmodules/Pmodules.git synced 2026-07-04 04:40:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

build-system: prefix for modulefiles can differ from install prefix

Browse Source
This commit is contained in:
gsell
2021-12-16 18:39:14 +01:00
parent 37e52a0f31
commit ddbbdf9be8
2 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/libpbuild.bash
+3 -3
View File
@@ -764,12 +764,12 @@ pbuild::make_all() {
fi
modulefile_dir=$(join_by '/' \
"${overlay_dir}/${GROUP}/${PMODULES_MODULEFILES_DIR}" \
"${ol_dir}/${GROUP}/${PMODULES_MODULEFILES_DIR}" \
"${names[@]}" \
"${module_name}")
modulefile_name="${modulefile_dir}/${module_version}"
PREFIX="${overlay_dir}/${GROUP}/${module_name}/${module_version}"
PREFIX="${ol_install_dir}/${GROUP}/${module_name}/${module_version}"
local -i i=0
for ((i=${#names[@]}-1; i >= 0; i--)); do
PREFIX+="/${names[i]}"
@@ -1479,7 +1479,7 @@ pbuild.bootstrap() {
MODULECMD=$(which true)
GROUP='Tools'
PREFIX="${overlay_dir}/${GROUP}/Pmodules/${PMODULES_VERSION}"
PREFIX="${ol_dir}/${GROUP}/Pmodules/${PMODULES_VERSION}"
C_INCLUDE_PATH="${PREFIX}/include"
CPLUS_INCLUDE_PATH="${PREFIX}/include"