commit 53fa87149b744ccb34e64dd4848863b60f11a836
author Yi Huang <ethanhuang1991@gmail.com> Tue Jun 10 20:14:26 2014 -0700
committer Yi Huang <ethanhuang1991@gmail.com> Wed Jun 11 07:46:22 2014 -0700
tree 60d4153d0038cf872af772ff6be677973e1b676c
parent 4a4566b56f40d810b8e29ff334b399007fd251ad

Fix install_all issue and failing test cases that fail after NRD becomes part of NFD.

Change-Id: Ic254244be99e289f43af86ecf6c82aad8460c538
Refs: #1641

install_helpers/install_NFD.py

diff --git a/install_helpers/install_NFD.py b/install_helpers/install_NFD.py
index 171b2e6..cf70d03 100644
--- a/install_helpers/install_NFD.py
+++ b/install_helpers/install_NFD.py
@@ -8,6 +8,7 @@
     os.system("git clone https://github.com/named-data/NFD --depth 1")
     os.chdir("NFD")
     os.system("./waf distclean")
+    os.system("git submodule init && git submodule update")
     os.system("./waf configure")
     os.system("./waf -j1")
     os.system("sudo ./waf install")

install_helpers/install_ndncxx.py

diff --git a/install_helpers/install_ndncxx.py b/install_helpers/install_ndncxx.py
index 87ef0ff..d5d6fa0 100644
--- a/install_helpers/install_ndncxx.py
+++ b/install_helpers/install_ndncxx.py
@@ -12,6 +12,4 @@
     os.system("./waf -j1")
     os.system("sudo ./waf install")
     os.system("mkdir -p ~/.ndn")
-    os.system("cp client.conf.sample ~/.ndn/client.conf")
-    os.system("sed -i 's/^protocol=.*$/protocol=nfd-0.1/g' ~/.ndn/client.conf")
     os.chdir("..")