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

Bugfix:

- Remove unnecessary path to control file (It was needed for building
  installed modules which we do not do any more
- Test for ../../pkgconfig/$modname.pc to decide whether a module is 
  installed or not. Fixes flyspray 1100.

[[Imported from SVN: r6738]]
parent c75f469c
Branches
Tags
No related merge requests found
......@@ -143,7 +143,7 @@ build_module() {
set -e
cd "$path"
export module
eval_control $runcommand $path/$(eval eval echo \$CONTROL_$module)
eval_control $runcommand $path/$CONTROL
); then eval echo "--- Failed to build \$NAME_${module} ---"; exit 1; fi
trap onfailure EXIT
......
......@@ -69,11 +69,9 @@ parse_control() {
# - source module: ${path}/dune.module
# and there is a file ${path}/${name}.pc.in
local path="$(canonicalpath "$1")"
if test -f $path/$CONTROL -a \
-f $path/../../../lib/dunecontrol/${name}/$CONTROL; then
if test -f $path/../../pkgconfig/${name}.pc; then
path=$(canonicalname "$path/../../../")
export module_inst="yes"
export CONTROL_${module}=lib/dunecontrol/${name}/$CONTROL
fi
if ! check_modname "$module"; then
echo "ERROR: $CONTROL files $1 contains an invalid Module entry" >&2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment