Skip to content

C
core
Kaydet (Commit) 64338258 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

configure.in: fix --with-solver-and-workdir-root: 

PathFormat fails if path does not exist
üst d87676da
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
configure.in
Dosyayı görüntüle @ 64338258
...@@ -2189,9 +2189,8 @@ if test -n "${with_solver_and_workdir_root}"; then ...@@ -2189,9 +2189,8 @@ if test -n "${with_solver_and_workdir_root}"; then
if ! test -d ${with_solver_and_workdir_root}; then if ! test -d ${with_solver_and_workdir_root}; then
AC_MSG_ERROR([directory does not exist: ${with_solver_and_workdir_root}]) AC_MSG_ERROR([directory does not exist: ${with_solver_and_workdir_root}])
fi fi
SOLARVER=${with_solver_and_workdir_root}/solver PathFormat "${with_solver_and_workdir_root}"
PathFormat "$SOLARVER" SOLARVER=${formatted_path}/solver
SOLARVER="$formatted_path"
else else
SOLARVER=${SRC_ROOT}/solver SOLARVER=${SRC_ROOT}/solver
fi fi
...@@ -3380,9 +3379,8 @@ fi ...@@ -3380,9 +3379,8 @@ fi
INPATH="${OUTPATH}${PROEXT}" INPATH="${OUTPATH}${PROEXT}"
if test -n "${with_solver_and_workdir_root}"; then if test -n "${with_solver_and_workdir_root}"; then
WORKDIR=${with_solver_and_workdir_root}/workdir/${INPATH} PathFormat "${with_solver_and_workdir_root}"
PathFormat "$WORKDIR" WORKDIR=${formatted_path}/workdir/${INPATH}
WORKDIR="$formatted_path"
else else
WORKDIR=${SRC_ROOT}/workdir/${INPATH} WORKDIR=${SRC_ROOT}/workdir/${INPATH}
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment