From 9a75d3bb35e3fac9377fc3eaae73494bbae47e1c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 11 Oct 2003 18:21:00 +0000 Subject: [PATCH] Fix multiple inclusion by "import" when relative paths to modules are specified. Changes so that in the direcotry specified case it fully normalizes the path to be absolute. [SVN r20354] --- boost-base.jam | 4 ++-- v1/boost-base.jam | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boost-base.jam b/boost-base.jam index 7ad12c267..143e6be6b 100644 --- a/boost-base.jam +++ b/boost-base.jam @@ -2567,8 +2567,8 @@ rule import ( modules + ) if $(d) { # Normalize the path relative to the invocation directory. - local p = [ simplify-path-tokens [ split-path $(d:R=$(SUBDIR)) ] ] $(n) ; - n = $(p:J=$(SLASH)) ; + n = [ root-paths $(n) : $(d:R=$(SUBDIR)) ] ; + n = [ root-paths $(n) : [ PWD ] ] ; search = ; # no searching; the path was specified. } diff --git a/v1/boost-base.jam b/v1/boost-base.jam index 7ad12c267..143e6be6b 100644 --- a/v1/boost-base.jam +++ b/v1/boost-base.jam @@ -2567,8 +2567,8 @@ rule import ( modules + ) if $(d) { # Normalize the path relative to the invocation directory. - local p = [ simplify-path-tokens [ split-path $(d:R=$(SUBDIR)) ] ] $(n) ; - n = $(p:J=$(SLASH)) ; + n = [ root-paths $(n) : $(d:R=$(SUBDIR)) ] ; + n = [ root-paths $(n) : [ PWD ] ] ; search = ; # no searching; the path was specified. }