From 6171070bec84bd84d1659576d646c9368531eacc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 6 Jul 2014 19:13:12 +0200 Subject: build: Use the canonical srcdir/builddir in 'pre-inst-env'. Fixes . * pre-inst-env.in (abs_top_builddir, abs_top_srcdir): Use 'pwd -P'. --- pre-inst-env.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pre-inst-env.in') diff --git a/pre-inst-env.in b/pre-inst-env.in index 15a48dedaa..233dfcc876 100644 --- a/pre-inst-env.in +++ b/pre-inst-env.in @@ -26,9 +26,11 @@ # By default we may end up with absolute directory names that contain '..', # which get into $GUILE_LOAD_PATH, leading to '..' in the module file names # recorded by Guile. To avoid that, make sure we get a real absolute -# directory name. -abs_top_srcdir="`cd "@abs_top_srcdir@" > /dev/null; pwd`" -abs_top_builddir="`cd "@abs_top_builddir@" > /dev/null; pwd`" +# directory name. Additionally, use '-P' to get the canonical directory name +# so that Guile's 'relative' %file-port-name-canonicalization can actually +# work (see .) +abs_top_srcdir="`cd "@abs_top_srcdir@" > /dev/null; pwd -P`" +abs_top_builddir="`cd "@abs_top_builddir@" > /dev/null; pwd -P`" GUILE_LOAD_COMPILED_PATH="$abs_top_builddir${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH" GUILE_LOAD_PATH="$abs_top_builddir:$abs_top_srcdir${GUILE_LOAD_PATH:+:}$GUILE_LOAD_PATH" -- cgit v1.2.3