Skip to content
Snippets Groups Projects
Commit 099ad827 authored by Markus Blatt's avatar Markus Blatt
Browse files

[dunecontrol] Fixes error with installed old DUNE modules

If duncontrol detects an installed dune-common module, then it always
assumed that it contains a lib/dunecontrol
subdirectory. Unfortunately, this does not hold for older dune-common
modules and dunecontrol will error out later with a message like

/usr/local/lib/dunecontrol: file not found
Execution of dunecontrol terminated due to errors!

With this commit we fix this by actually checking whether the
lib/dunecontrol subdirectoy exists before adding it to
DUNE_CONTROL_PATH.

Thanks a lot to wuhao sife for reporting this problem.
parent 2a9a2a2f
No related branches found
No related tags found
No related merge requests found
......@@ -211,7 +211,13 @@ setup_control_path() {
fi
done
else
DUNE_CONTROL_PATH=$DUNE_CONTROL_PATH:$(pkg-config dune-common --variable=prefix)/lib/dunecontrol
NEW_DUNE_CONTROL_DIR=$(pkg-config dune-common --variable=prefix)/lib/dunecontrol
# There might be old version of DUNE lying around, that do not contain
# lib/dunecontrol, yet. To prevent failur at a later stage of dunecontrol
# we check that the directory really exists.
if test -d "$NEW_DUNE_CONTROL_DIR"; then
DUNE_CONTROL_PATH=$DUNE_CONTROL_PATH:$NEW_DUNE_CONTROL_DIR
fi
fi
fi
# try to read DUNE_CONTROL_PATH from OPTS file
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment