[rtems-libbsd commit] Update rtems_waf module

[Sebastian Huber]

Module:    rtems-libbsd
Branch:    4.11
Commit:    5aa22c60afd445de7dda00e168a4adb4e09d236e
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=5aa22c60afd445de7dda00e168a4adb4e09d236e

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Nov 13 10:58:45 2015 +0100

Update rtems_waf module

---

 rtems_waf        | 2 +-
 waf_generator.py | 4 ++--
 wscript          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rtems_waf b/rtems_waf
index 7bcf72b..b548c77 160000
--- a/rtems_waf
+++ b/rtems_waf
@@ -1 +1 @@
-Subproject commit 7bcf72b72ec42f2feedac5f5cc5f2f57d50b5d2b
+Subproject commit b548c77d81e390a40d4afba8afc35c8175191f0b
diff --git a/waf_generator.py b/waf_generator.py
index ff55031..9e481d0 100755
--- a/waf_generator.py
+++ b/waf_generator.py
@@ -549,14 +549,14 @@ class ModuleManager(builder.ModuleManager):
         # Head file collector.
         #
         self.add('    # Installs.    ')
-        self.add('    bld.install_files("${PREFIX}/" + rtems.arch_bsp_lib_path(bld.env.RTEMS_ARCH_BSP), ["libbsd.a"])')
+        self.add('    bld.install_files("${PREFIX}/" + rtems.arch_bsp_lib_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), ["libbsd.a"])')
         header_paths = builder.header_paths()
         self.add('    header_paths = [%s,' % (str(header_paths[0])))
         for hp in header_paths[1:-1]:
             self.add('                     %s,' % (str(hp)))
         self.add('                     %s]' % (str(header_paths[-1])))
         self.add('    for headers in header_paths:')
-        self.add('        ipath = os.path.join(rtems.arch_bsp_include_path(bld.env.RTEMS_ARCH_BSP), headers[2])')
+        self.add('        ipath = os.path.join(rtems.arch_bsp_include_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), headers[2])')
         self.add('        start_dir = bld.path.find_dir(headers[0])')
         self.add('        bld.install_files("${PREFIX}/" + ipath,')
         self.add('                          start_dir.ant_glob("**/" + headers[1]),')
diff --git a/wscript b/wscript
index 86d3ccf..afe02a1 100644
--- a/wscript
+++ b/wscript
@@ -1127,7 +1127,7 @@ def build(bld):
               use = libbsd_use)
 
     # Installs.    
-    bld.install_files("${PREFIX}/" + rtems.arch_bsp_lib_path(bld.env.RTEMS_ARCH_BSP), ["libbsd.a"])
+    bld.install_files("${PREFIX}/" + rtems.arch_bsp_lib_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), ["libbsd.a"])
     header_paths = [('rtemsbsd/include', '*.h', ''),
                      ('rtemsbsd/mghttpd', 'mongoose.h', 'mghttpd'),
                      ('freebsd/include', '*.h', ''),
@@ -1148,7 +1148,7 @@ def build(bld):
                      ('mDNSResponder/mDNSShared', 'dns_sd.h', ''),
                      ('mDNSResponder/mDNSPosix', 'mDNSPosix.h', '')]
     for headers in header_paths:
-        ipath = os.path.join(rtems.arch_bsp_include_path(bld.env.RTEMS_ARCH_BSP), headers[2])
+        ipath = os.path.join(rtems.arch_bsp_include_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), headers[2])
         start_dir = bld.path.find_dir(headers[0])
         bld.install_files("${PREFIX}/" + ipath,
                           start_dir.ant_glob("**/" + headers[1]),