Path changes for tests and install

moneal · moneal · commit 7193584332bb · 2011-12-14T15:38:14.000-08:00
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 NODE_JS = $(if $(shell test -f /usr/bin/nodejs && echo "true"),nodejs,node)
 NODE_BLD = node-waf
-NODE_LIB_PATH = ~/.node_libraries
+NODE_LIB_PATH = ~/.node_modules
 
 BASE = .
 INSTALL_PATH = $(NODE_LIB_PATH)/nodegit
@@ -22,11 +22,11 @@ debug:
 
 install:
 	@@mkdir -p $(INSTALL_PATH)
-	@@mkdir -p $(INSTALL_PATH)/build/default
+	@@mkdir -p $(INSTALL_PATH)/build/Release
 	@@mkdir -p $(INSTALL_PATH)/lib
 	@@mkdir -p $(INSTALL_PATH)/vendor
 
-	@@cp -f $(BASE)/build/Release/nodegit.node $(INSTALL_PATH)/build/default/nodegit.node
+	@@cp -f $(BASE)/build/Release/nodegit.node $(INSTALL_PATH)/build/Release/nodegit.node
 	@@cp -f $(BASE)/lib/* $(INSTALL_PATH)/lib/
 	@@cp -rf $(BASE)/vendor/* $(INSTALL_PATH)/vendor/
 	@@cp -f $(BASE)/package.json $(INSTALL_PATH)/
diff --git a/lib/index.js b/lib/index.js
@@ -24,6 +24,6 @@ exports.tree = require("./tree.js").tree;
 exports.entry = require("./tree_entry.js").entry;
 
 // Assign raw api to module
-exports.raw = require("../build/default/nodegit");
+exports.raw = require("../build/Release/nodegit");
 // Set version
 exports.version = "0.0.6";
diff --git a/test/index.js b/test/index.js
@@ -1,10 +1,9 @@
-require.paths.unshift( '../vendor' );
 
 try {
   var reporter = require( '../vendor/nodeunit' ).reporters['default'];
 }
 catch( e ) {
-  var sys = require( 'sys' );
+  var sys = require( 'util' );
   sys.puts( 'Cannot find nodeunit module.' );
   sys.puts( 'You can download submodules for this project by doing:' );
   sys.puts( '' );
@@ -17,7 +16,7 @@ try {
   var rimraf = require( '../vendor/rimraf' );
 }
 catch(e) {
-  var sys = require( 'sys' );
+  var sys = require( 'util' );
   sys.puts( 'Cannot find rimraf module.' );
   sys.puts( 'You can download submodules for this project by doing:' );
   sys.puts( '' );
