From db0edaafe15831ba6fa9c2109da37942506c62b1 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 23 Jan 2016 11:14:05 +0200
Subject: Cleanup absolute/relative path diagnostics by introducing stream
 verbosity

---
 build2/target.cxx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'build2/target.cxx')

diff --git a/build2/target.cxx b/build2/target.cxx
index 0dcf959..43c6a41 100644
--- a/build2/target.cxx
+++ b/build2/target.cxx
@@ -254,10 +254,16 @@ namespace build2
     // inside {}, e.g., dir{bar/}, not bar/dir{}.
     //
     bool n (!k.name->empty ());
-    string d (diag_relative (*k.dir, false));
 
     if (n)
-      os << d;
+    {
+      // Avoid printing './' in './{...}'
+      //
+      if (stream_verb (os) < 2)
+        os << diag_relative (*k.dir, false);
+      else
+        os << *k.dir;
+    }
 
     os << k.type->name << '{';
 
@@ -269,7 +275,7 @@ namespace build2
         os << '.' << *k.ext;
     }
     else
-      os << d;
+      os << *k.dir;
 
     os << '}';
 
-- 
cgit v1.1