commit 964feb928bd0a4e210500da6e67b0d6458999725
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Mar 22 13:03:11 2016 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Mar 22 17:01:49 2016 -0700
tree 305d99b54f1ea0c73d447641102b36023b35ad36
parent 81509f3bee7e43e7a8cf7c2b17c75eb6596d7108

Fixing a few bugs

Change-Id: Ibc65ad1d41fca4a6244b246cd30428965f707227

make-deps.sh

diff --git a/make-deps.sh b/make-deps.sh
index d47e7a0..6a353e7 100755
--- a/make-deps.sh
+++ b/make-deps.sh
@@ -26,28 +26,22 @@
 
 patch -p1 <<EOF
 diff --git a/src/transport/unix-transport.cpp b/src/transport/unix-transport.cpp
-index 59c00ae..aa67b24 100644
+index 6b86a34..e72170e 100644
 --- a/src/transport/unix-transport.cpp
 +++ b/src/transport/unix-transport.cpp
-@@ -74,7 +74,7 @@ UnixTransport::getDefaultSocketName(const ConfigFile& config)
+@@ -72,7 +72,7 @@ UnixTransport::getDefaultSocketName(const ConfigFile& config)
      }
-
+ 
    // Assume the default nfd.sock location.
 -  return "/var/run/nfd.sock";
 +  return "/tmp/nfd.sock";
  }
-
+ 
  shared_ptr<UnixTransport>
-@@ -135,4 +135,4 @@ UnixTransport::resume()
-
- }
-
--#endif // _WIN32
-\ No newline at end of file
-+#endif // _WIN32
 EOF
 
-./waf configure --prefix="${path}/build/deps"
+./waf configure --prefix="${path}/build/deps" \
+                --sysconfdir="/Applications/NDN.app/Contents/etc"
 ./waf build
 ./waf install
 popd
@@ -60,7 +54,8 @@
 git checkout ${NFD_COMMIT}
 git submodule update --init
 PKG_CONFIG_PATH="${path}/build/deps/lib/pkgconfig:${PKG_CONFIG_PATH}" \
-               ./waf configure --prefix="${path}/build/deps"
+               ./waf configure --prefix="${path}/build/deps" \
+                               --sysconfdir="/Applications/NDN.app/Contents/etc"
 ./waf build
 ./waf install
 popd