Move GYP file to the project root

1 files changed, 2 insertions, 4 deletions

diff --git a/tools/gyp_node b/tools/gyp_node
index 81afc664f4..3cc65276dc 100755
--- a/tools/gyp_node
+++ b/tools/gyp_node
@@ -22,7 +22,7 @@ def run_gyp(args):
 
 if __name__ == '__main__':
   args = sys.argv[1:]
-  args.append(os.path.join(script_dir, 'all.gyp'))
+  args.append(os.path.join(os.path.abspath(node_root), 'node.gyp'))
 
   options_fn = os.path.abspath(os.path.join(node_root, 'options.gypi'))
   if os.path.exists(options_fn):
@@ -31,12 +31,10 @@ if __name__ == '__main__':
   args.append('--depth=' + node_root)
 
   if sys.platform != 'win32':
-    # Tell gyp to write the Makefiles into output_dir
-    args.extend(['--generator-output', output_dir])
-
     # Tell make to write its output into the same dir
     args.extend(['-Goutput_dir=' + output_dir])
 
+  args.append('-S-nodegyp')
   args.append('-Dtarget_arch=ia32')
   args.append('-Dcomponent=static_library')
   args.append('-Dlibrary=static_library')