From f06b995c2642b991a201d7c121275d963478a9cc Mon Sep 17 00:00:00 2001
From: Alexander Afanasyev <aa@cs.fiu.edu>
Date: Mon, 18 Mar 2019 14:19:01 -0400
Subject: [PATCH] Bug fix in the updated build environment

---
 .waf-tools/default-compiler-flags.py | 2 +-
 wscript                              | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.waf-tools/default-compiler-flags.py b/.waf-tools/default-compiler-flags.py
index 9e045c3..146c6b3 100644
--- a/.waf-tools/default-compiler-flags.py
+++ b/.waf-tools/default-compiler-flags.py
@@ -143,7 +143,7 @@ class GccBasicFlags(CompilerFlags):
                               '-pedantic',
                               '-Wall',
                               '-Wextra',
-                              '-Werror',
+                              # '-Werror',
                               '-Wnon-virtual-dtor',
                               '-Wno-error=deprecated-declarations', # Bug #3795
                               '-Wno-error=maybe-uninitialized', # Bug #1615
diff --git a/wscript b/wscript
index d6cdc73..e2df807 100644
--- a/wscript
+++ b/wscript
@@ -77,8 +77,8 @@ def build (bld):
         use = deps,
         )
 
-    for scenario in bld.path.ant_glob (['scenarios/*.cc']):
-        name = str(scenario)[:-len(".cc")]
+    for scenario in bld.path.ant_glob(['scenarios/*.cc']):
+        name = scenario.change_ext('').path_from(bld.path.find_node('scenarios/').get_bld())
         app = bld.program (
             target = name,
             features = ['cxx'],
@@ -87,8 +87,8 @@ def build (bld):
             includes = "extensions"
             )
 
-    for scenario in bld.path.ant_glob (['scenarios/*.cpp']):
-        name = str(scenario)[:-len(".cpp")]
+    for scenario in bld.path.ant_glob(['scenarios/*.cpp']):
+        name = scenario.path_from(bld.path)
         app = bld.program (
             target = name,
             features = ['cxx'],