Leverage Makefile install to move files in the correct directory

Author: Stephen Parente

binding.gyp

@@ -64,16 +64,16 @@
                       'OS=="linux"',
                       {
                         "libraries": [
-                          "<(module_root_dir)/build/Release/librdkafka++.so",
-                          "-Wl,-rpath=<(module_root_dir)/build/Release",
+                          "<(module_root_dir)/build/deps/librdkafka++.so",
+                          "-Wl,-rpath=<(module_root_dir)/build/deps",
                         ],
                       }
                     ],
                     [
                       'OS=="mac"',
                       {
                         "libraries": [
-                          "<(module_root_dir)/build/Release/librdkafka++.dylib",
+                          "<(module_root_dir)/build/deps/librdkafka++.dylib",
                         ],
                       }
                     ]

configure

@@ -5,8 +5,11 @@
 
 # This does not get run on windows which uses the build in solutions file
 
+# Get script directory
+scriptdir=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
+
 pushd ./deps/librdkafka &> /dev/null
 
-./configure $*
+./configure --prefix="${scriptdir}/build/deps" --libdir="${scriptdir}/build/deps" $*
 
 popd &> /dev/null

deps/librdkafka.gyp

@@ -60,47 +60,14 @@
             },
           },
           {
-            "conditions": [
-              [
-                'OS=="mac"',
-                {
-                  'copies': [
-                    {
-                      'files': [
-                        '<(module_root_dir)/deps/librdkafka/src-cpp/librdkafka++.dylib',
-                        '<(module_root_dir)/deps/librdkafka/src-cpp/librdkafka++.1.dylib',
-                        '<(module_root_dir)/deps/librdkafka/src/librdkafka.dylib',
-                        '<(module_root_dir)/deps/librdkafka/src/librdkafka.1.dylib'
-                      ],
-                      'destination': '<(module_root_dir)/build/Release'
-                    }
-                  ],
-                },
-                {
-                  'copies': [
-                    {
-                      'files': [
-                        '<(module_root_dir)/deps/librdkafka/src-cpp/librdkafka++.so',
-                        '<(module_root_dir)/deps/librdkafka/src-cpp/librdkafka++.so.1',
-                        '<(module_root_dir)/deps/librdkafka/src/librdkafka.so',
-                        '<(module_root_dir)/deps/librdkafka/src/librdkafka.so.1',
-                        '<(module_root_dir)/deps/librdkafka/src-cpp/librdkafka++.a',
-                        '<(module_root_dir)/deps/librdkafka/src/librdkafka.a',
-                      ],
-                      'destination': '<(module_root_dir)/build/Release'
-                    }
-                  ],
-                }
-              ]
-            ],
             "actions": [
               {
                 "action_name": "build_dependencies",
                 "inputs": [
                   "<(module_root_dir)/deps/librdkafka/config.h",
                 ],
                 "action": [
-                  "make", "-C", "<(module_root_dir)/deps/librdkafka", "libs"
+                  "make", "-C", "<(module_root_dir)/deps/librdkafka", "libs", "install"
                 ],
                 "conditions": [
                   [

util/configure.js

@@ -6,8 +6,7 @@ var fs = require('fs');
 var path = require('path');
 
 var baseDir = path.resolve(__dirname, '../');
-var releaseDir = path.join(baseDir, 'build', 'Release');
-var debugDir = path.join(baseDir, 'build', 'Debug');
+var releaseDir = path.join(baseDir, 'build', 'deps');
 
 var isWin = /^win/.test(process.platform);