Merge pull request #76 from m1el/master

fixed libsodium build

.dntrc

@@ -6,6 +6,6 @@ OUTPUT_PREFIX="sodium-"
 TEST_CMD="\
   cd /dnt/ && \
   npm install && \
-  node_modules/.bin/node-gyp --nodedir /usr/src/node/ rebuild && \
+  node-gyp --nodedir /usr/src/node/ rebuild && \
   make test; \
 "

.gitignore

@@ -158,23 +158,21 @@ deps/libsodium/testing
 .libs
 Build
 INSTALL
-Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache
 build
 compile
 confdefs.h
 config.*
-configure
 configure.lineno
 coverage.info
 depcomp
 android-toolchain
 install-sh
 libtool
 libsodium.pc
-libsodium-*
+libsodium-*.pc
 ltmain.sh
 m4/argz.m4
 m4/libtool.m4

Makefile

@@ -59,8 +59,9 @@ ec:
 libsodium:
 ifeq (,$(wildcard ${STATIC_LIB}.*))
 	@echo Static libsodium was not found at ${STATIC_LIB} so compiling libsodium from source.
-	@cd $(LIBSODIUM_DIR)/ && ./configure  \
-		--enable-static --enable-shared --with-pic --prefix="$(INSTALL_DIR)"
+	@cd $(LIBSODIUM_DIR)/ && ./autogen.sh
+	@cd $(LIBSODIUM_DIR)/ && ./configure --enable-static \
+           --enable-shared --with-pic --prefix="$(INSTALL_DIR)"
 	@cd $(LIBSODIUM_DIR)/ && make clean > /dev/null
 	@cd $(LIBSODIUM_DIR)/ && make -j3 check
 	@cd $(LIBSODIUM_DIR)/ && make -j3 install
@@ -71,7 +72,7 @@ else
 endif
 
 sodium: libsodium
-	$(BINDIR)/node-gyp rebuild
+	node-gyp rebuild
 
 test: test-unit