place mapnik_settings in lib/binding

mapnik · Jan 23, 2014 · ca0d695 · ca0d695
1 parent a7a70ee
commit ca0d695
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -137,7 +137,7 @@
               'gen_settings.py'
             ],
             'outputs': [
-              'lib/mapnik_settings.js'
+              'lib/binding/mapnik_settings.js'
             ],
             'action': ['python', 'gen_settings.py']
           },

diff --git a/lib/mapnik.js b/lib/mapnik.js
@@ -1,4 +1,8 @@
-var settings = require('./mapnik_settings.js');
+var path = require('path');
+var pkg = require('../package.json');
+var binding_path = path.join(__dirname,'../',pkg.binary.module_path);
+var settings_path = path.join(binding_path,'mapnik_settings.js');
+var settings = require(settings_path);
 
 // set custom env settings before loading mapnik
 if (settings.env) {
@@ -10,11 +14,7 @@ if (settings.env) {
     }
 }
 
-var path = require('path');
-var pkg = require('../package.json');
-var module_path = path.join(
-     path.join(__dirname,'../',pkg.binary.module_path),
-     pkg.binary.module_name + '.node');
+var module_path = path.join(binding_path,pkg.binary.module_name + '.node');
 var mapnik = require(module_path);
 exports = module.exports = mapnik;
 var exists = require('fs').existsSync || require('path').existsSync;