mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-30 06:50:31 +02:00
fix duplicate path in uninstalled-env
* meta/uninstalled-env.in: Our code that checked for paths already being in the load path was not working for the last entry in the load path. This caused the last entry to be re-added to the beginning, which also caused relative filename canonicalization to prepend "module/" to everything. Terrible.
This commit is contained in:
parent
987b8160f5
commit
1c8a6308c0
1 changed files with 3 additions and 0 deletions
|
@ -59,10 +59,12 @@ else
|
||||||
# The ":" prevents prefix aliasing.
|
# The ":" prevents prefix aliasing.
|
||||||
case x"$GUILE_LOAD_PATH" in
|
case x"$GUILE_LOAD_PATH" in
|
||||||
x*${top_srcdir}${d}:*) ;;
|
x*${top_srcdir}${d}:*) ;;
|
||||||
|
x*${top_srcdir}${d}) ;;
|
||||||
*) GUILE_LOAD_PATH="${top_srcdir}${d}:$GUILE_LOAD_PATH" ;;
|
*) GUILE_LOAD_PATH="${top_srcdir}${d}:$GUILE_LOAD_PATH" ;;
|
||||||
esac
|
esac
|
||||||
case x"$GUILE_LOAD_PATH" in
|
case x"$GUILE_LOAD_PATH" in
|
||||||
x*${top_builddir}${d}:*) ;;
|
x*${top_builddir}${d}:*) ;;
|
||||||
|
x*${top_builddir}${d}) ;;
|
||||||
*) GUILE_LOAD_PATH="${top_builddir}${d}:$GUILE_LOAD_PATH" ;;
|
*) GUILE_LOAD_PATH="${top_builddir}${d}:$GUILE_LOAD_PATH" ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
@ -79,6 +81,7 @@ else
|
||||||
# The ":" prevents prefix aliasing.
|
# The ":" prevents prefix aliasing.
|
||||||
case x"$GUILE_LOAD_COMPILED_PATH" in
|
case x"$GUILE_LOAD_COMPILED_PATH" in
|
||||||
x*${top_builddir}${d}:*) ;;
|
x*${top_builddir}${d}:*) ;;
|
||||||
|
x*${top_builddir}${d}) ;;
|
||||||
*) GUILE_LOAD_COMPILED_PATH="${top_builddir}${d}:$GUILE_LOAD_COMPILED_PATH" ;;
|
*) GUILE_LOAD_COMPILED_PATH="${top_builddir}${d}:$GUILE_LOAD_COMPILED_PATH" ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue