commit c4e4cd29b98dda112c7fec750795126850707b7c
author Obaid Amin <obaid@Obaids-MacBook.local> Wed Jan 16 21:45:48 2013 -0600
committer Obaid Amin <obaid@Obaids-MacBook.local> Wed Jan 16 21:45:48 2013 -0600
tree a5ddea451e5461402e3b8d41597accba43db6597
parent 71169e4895bb2b158d44f5d04eeca638681c89bd
parent fb7d0bc684f3b75bc6d84ec6e6a710dd14fdb4eb

Merge branch 'master' of github.com:NDN-Routing/NLSR0.0

Makefile

diff --git a/Makefile b/Makefile
index 893ff21..3236fe6 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@
 clean:
 	rm -f *.o
 	rm -f $(PROGRAMS)
-	rm -rf $(PROGRAMS).dSYM
+	rm -rf *.dSYM
 
 .c.o:
 	$(CC) $(CFLAGS) -c $<

nlsr-sync-0.0/macbook.conf

diff --git a/nlsr-sync-0.0/macbook.conf b/nlsr-sync-0.0/macbook.conf
index 4150a56..c64b1da 100755
--- a/nlsr-sync-0.0/macbook.conf
+++ b/nlsr-sync-0.0/macbook.conf
@@ -15,7 +15,7 @@
 multi-path-face-num 2 
 debug on
 
-topo-prefix /ndn/test/topo
-slice-prefix /ndn/test/slice
+topo-prefix /ndn/routing/nlsr/
+slice-prefix /ndn/routing/nlsr/LSA
 
 logdir /Users/akmhoque/NLSR2.0