Variable assignment, appending support

1 files changed, 17 insertions, 4 deletions

diff --git a/build/prerequisite.cxx b/build/prerequisite.cxx
index f2c72e5..feb6381 100644
--- a/build/prerequisite.cxx
+++ b/build/prerequisite.cxx
@@ -30,8 +30,15 @@ namespace build
       {
         string s (diag_relative_work (p.scope.path ()));
 
-        if (!s.empty () && s.back () != path::traits::directory_separator)
-          os << s << path::traits::directory_separator << ": ";
+        if (s != ".")
+        {
+          os << s;
+
+          if (s.back () != path::traits::directory_separator)
+            os << path::traits::directory_separator;
+
+          os << ": ";
+        }
       }
 
       // Print directory.
@@ -40,8 +47,14 @@ namespace build
       {
         string s (diag_relative_work (p.dir));
 
-        if (!s.empty () && s.back () != path::traits::directory_separator)
-          os << s << path::traits::directory_separator;
+        if (s != ".")
+        {
+          os << s;
+
+          if (!p.name.empty () &&
+              s.back () != path::traits::directory_separator)
+            os << path::traits::directory_separator;
+        }
       }
 
       os << p.name;