Install wafadmin into $PREFIX/lib/node/wafadmin

This is in preparation for a special node_waf script for building external
modules.

Also change system library path to $PREFIX/lib/node/libraries

diff --git a/src/node.js b/src/node.js
index 3da5f79..1cf7989 100644 (file)
--- a/src/node.js
+++ b/src/node.js
@@ -53,7 +53,7 @@ clearInterval = clearTimeout;
 // Module
 
 node.libraryPaths = [ node.path.join(ENV["HOME"], ".node_libraries")
-                    , node.path.join(node.installPrefix, "lib/node_libraries")
+                    , node.path.join(node.installPrefix, "lib/node/libraries")
                     , "/" 
                     ];
 

diff --git a/wscript b/wscript
index 4f7b077..00c529b 100644 (file)
--- a/wscript
+++ b/wscript
@@ -372,4 +372,9 @@ def build(bld):
   """);
   bld.install_files('${PREFIX}/share/man/man1/', 'doc/node.1');
   bld.install_files('${PREFIX}/bin/', 'bin/*', chmod=0755);
-  bld.install_files('${PREFIX}/lib/node_libraries/', 'lib/*.js');
+
+  # Why am I using two lines? Because WAF SUCKS.
+  bld.install_files('${PREFIX}/lib/node/wafadmin', 'tools/wafadmin/*.py');
+  bld.install_files('${PREFIX}/lib/node/wafadmin/Tools', 'tools/wafadmin/Tools/*.py');
+
+  bld.install_files('${PREFIX}/lib/node/libraries/', 'lib/*.js');