From 87e7872f61915dbf3715768074e57e898f3a20a3 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike@mikegerwitz.com>
Date: Sun, 27 Mar 2011 02:02:04 -0400
Subject: [PATCH] Using __dirname for modules rather than relative path

---
 lib/class.js         | 8 ++++----
 lib/class_builder.js | 4 ++--
 lib/interface.js     | 6 +++---
 lib/propobj.js       | 2 +-
 lib/util.js          | 2 +-
 tools/combine        | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/class.js b/lib/class.js
index 5084705..139ab71 100644
--- a/lib/class.js
+++ b/lib/class.js
@@ -22,10 +22,10 @@
  * @package core
  */
 
-var util           = require( './util' ),
-    class_builder  = require( './class_builder' ),
-    member_builder = require( './member_builder' ),
-    propobj        = require( './propobj' )
+var util           = require( __dirname + '/util' ),
+    class_builder  = require( __dirname + '/class_builder' ),
+    member_builder = require( __dirname + '/member_builder' ),
+    propobj        = require( __dirname + '/propobj' )
 ;
 
 
diff --git a/lib/class_builder.js b/lib/class_builder.js
index 4fef945..d982647 100644
--- a/lib/class_builder.js
+++ b/lib/class_builder.js
@@ -22,8 +22,8 @@
  * @package core
  */
 
-var util           = require( './util' ),
-    member_builder = require( './member_builder' )
+var util           = require( __dirname + '/util' ),
+    member_builder = require( __dirname + '/member_builder' )
 ;
 
 
diff --git a/lib/interface.js b/lib/interface.js
index 0769642..4f419de 100644
--- a/lib/interface.js
+++ b/lib/interface.js
@@ -22,9 +22,9 @@
  * @package core
  */
 
-var util           = require( './util' ),
-    member_builder = require( './member_builder' ),
-    Class          = require( './class' );
+var util           = require( __dirname + '/util' ),
+    member_builder = require( __dirname + '/member_builder' ),
+    Class          = require( __dirname + '/class' );
 
 
 /**
diff --git a/lib/propobj.js b/lib/propobj.js
index 38d59e6..5c14cda 100644
--- a/lib/propobj.js
+++ b/lib/propobj.js
@@ -22,7 +22,7 @@
  * @package core
  */
 
-var util = require( './util' ),
+var util = require( __dirname + '/util' ),
 
     // whether or not we support defining properties through
     // Object.defineProperty()
diff --git a/lib/util.js b/lib/util.js
index 2a13d27..db24f97 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -22,7 +22,7 @@
  * @package core
  */
 
-var propParseKeywords = require( './prop_parser' ).parseKeywords;
+var propParseKeywords = require( __dirname + '/prop_parser' ).parseKeywords;
 
 
 /**
diff --git a/tools/combine b/tools/combine
index f6a6cba..61df457 100755
--- a/tools/combine
+++ b/tools/combine
@@ -85,14 +85,14 @@ for module in $CAT_MODULES; do
 
     # each module must be enclosed in a closure to emulate a module
     echo "/** $module **/"
-    echo "( function( module )"
+    echo "( function( module, __dirname )"
     echo "{"
     echo "    var exports = module.exports = {};"
 
     # add the module, removing trailing commas
     cat $filename | $RMTRAIL
 
-    echo "} )( module['$module'] = {} );"
+    echo "} )( module['$module'] = {}, '.' );"
 done
 
 # include tests?