[rtems-libbsd commit] Use latest rtems_waf

[Sebastian Huber]

Module:    rtems-libbsd
Branch:    master
Commit:    a76483d8dd5672f047cc0869bc932da7298b8ae7
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=a76483d8dd5672f047cc0869bc932da7298b8ae7

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

Use latest rtems_waf

---

 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..4a549d2 160000
--- a/rtems_waf
+++ b/rtems_waf
@@ -1 +1 @@
-Subproject commit 7bcf72b72ec42f2feedac5f5cc5f2f57d50b5d2b
+Subproject commit 4a549d2b2dff85aec2fe656da90f3b641c92c121
diff --git a/waf_generator.py b/waf_generator.py
index a006480..0fab123 100755
--- a/waf_generator.py
+++ b/waf_generator.py
@@ -552,14 +552,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 f2ba9af..b20ce53 100644
--- a/wscript
+++ b/wscript
@@ -1102,7 +1102,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', ''),
@@ -1123,7 +1123,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]),