[rtems-libbsd commit] Revert " Move network-config.h to the top of the testsuite include path."

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri May  6 08:04:51 2016 +0200

Revert "Move network-config.h to the top of the testsuite include path."

This reverts commit a51d0fea6880046300fcf466a767f88eab9a6f9a.

---

 libbsd_waf.py    | 2 +-
 waf_generator.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libbsd_waf.py b/libbsd_waf.py
index d83cb94..1f50306 100644
--- a/libbsd_waf.py
+++ b/libbsd_waf.py
@@ -105,7 +105,7 @@ def build(bld):
                 net_cfg_gateway_ip = rhs
             if lhs == "NET_TAP_INTERFACE":
                 net_tap_interface = rhs
-    bld(target = "testsuite/include/network-config.h",
+    bld(target = "testsuite/include/rtems/bsd/test/network-config.h",
         source = "testsuite/include/rtems/bsd/test/network-config.h.in",
         rule = "sed -e 's/@NET_CFG_SELF_IP@/%s/' -e 's/@NET_CFG_NETMASK@/%s/' -e 's/@NET_CFG_PEER_IP@/%s/' -e 's/@NET_CFG_GATEWAY_IP@/%s/' < ${SRC} > ${TGT}" % (net_cfg_self_ip, net_cfg_netmask, net_cfg_peer_ip, net_cfg_gateway_ip),
         update_outputs = True)
diff --git a/waf_generator.py b/waf_generator.py
index 8e2f21a..12895a7 100755
--- a/waf_generator.py
+++ b/waf_generator.py
@@ -338,7 +338,7 @@ class ModuleManager(builder.ModuleManager):
         self.add('                net_cfg_gateway_ip = rhs')
         self.add('            if lhs == "NET_TAP_INTERFACE":')
         self.add('                net_tap_interface = rhs')
-        self.add('    bld(target = "testsuite/include/network-config.h",')
+        self.add('    bld(target = "testsuite/include/rtems/bsd/test/network-config.h",')
         self.add('        source = "testsuite/include/rtems/bsd/test/network-config.h.in",')
         self.add('        rule = "sed -e \'s/@NET_CFG_SELF_IP@/%s/\' ' + \
                  '-e \'s/@NET_CFG_NETMASK@/%s/\' ' + \