update INSTALL.md, use mini-ndn name in CLI
refs: #3969, #3980
Change-Id: Idd84d70b5edfa8fb06cf5158ccca452764d77eb7
diff --git a/install.sh b/install.sh
index e132e62..b7d6daa 100755
--- a/install.sh
+++ b/install.sh
@@ -136,12 +136,11 @@
fi
if [[ $DIST == Ubuntu || $DIST == Debian ]]; then
- $install git libsqlite3-dev libboost-all-dev make g++
- crypto
+ $install git libsqlite3-dev libboost-all-dev make g++ libssl-dev libcrypto++-dev
fi
if [[ $DIST == Fedora ]]; then
- $install gcc-c++ sqlite-devel boost-devel
+ $install gcc-c++ sqlite-devel boost-devel openssl-devel cryptopp-devel
fi
git clone --depth 1 https://github.com/named-data/ndn-cxx
@@ -153,21 +152,6 @@
cd ../
}
-function crypto {
- mkdir crypto
- cd crypto
- $install unzip
- wget http://www.cryptopp.com/cryptopp562.zip
- unzip cryptopp562.zip
-
- # Uncomments flags to build shared object
- sed -i '/^# CXXFLAGS += -fPIC/s/^# //' GNUmakefile
-
- make static dynamic
- sudo make install
- cd ../
-}
-
function tools {
if [[ $cxx != true ]]; then
ndncxx
@@ -218,7 +202,7 @@
sudo cp ndn_utils/topologies/minindn.caida.conf "$install_dir"
sudo cp ndn_utils/topologies/minindn.ucla.conf "$install_dir"
sudo cp ndn_utils/topologies/minindn.testbed.conf "$install_dir"
- sudo python setup.py install
+ sudo python setup.py clean --all install
}