resolve merge conflict

README.md

@@ -1,4 +1,17 @@
-Compile javascript **with** node.js. This allows you to move your executable around *without* needing to install the node.js runtime.
+### Nexe
+
+Nexe is a command-line utility that compiles your Node.js application into a single executable file.
+
+![screen shot 2014-02-28 at 10 32 54 am](https://f.cloud.github.com/assets/757408/2296993/c276f7b6-a0a6-11e3-86d3-e6c5feba2a85.png)
+
+
+### Motivation
+
+- Ability to run multiple applications with *different* node.js runtimes. 
+- Distributable binaries without needing node / npm.
+- Starts faster.
+- Lockdown specific application versions, and easily rollback.
+- Faster deployments.
 
 ## Requirements
 
@@ -23,14 +36,6 @@ Or git:
 	git clone 
 ```
 
-
-### Motivation
-
-- Developing client-side utilities without requiring to install a bunch of dependencies first (node.js, npm).
-- Ability to run multiple node.js applications with *different* node.js runtimes. 
-- Distributable packages without needing node / npm.
-- Loads faster.
-
 ### CLI Usage
 
 ````text

lib/exe.js

@@ -9,6 +9,7 @@ ProgressBar   = require("progress"),
 child_process = require("child_process"),
 glob          = require("glob"),
 sardines      = require("sardines"),
+os	      = require("os"),
 spawn         = child_process.spawn;
 
 
@@ -180,7 +181,11 @@ function _getNodeCompiler (nodeFileDir, complete) {
 				configure.stdout.pipe(process.stdout);
 				configure.stderr.pipe(process.stderr);
 				configure.on("close", function () {
-					var make = spawn("make", [], { cwd: dir });
+					var platformMake = "make";
+					if (os.platform().match(/bsd$/) != null) {
+						platformMake = "gmake";
+					}
+					var make = spawn(platformMake, [], { cwd: dir });
 					make.stdout.pipe(process.stdout);
 					make.stderr.pipe(process.stderr);
 					make.on("close", function () {

package.json

@@ -2,7 +2,7 @@
   "author": "Craig Condon <craig.j.condon@gmail.com>",
   "name": "nexe",
   "description": "Roll node.s applications into a single executable",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "repository": {
     "type": "git",
     "url": "git://github.com/crcn/nexe.git"