Permalink
Browse files

wip, not wokring yet, but sort of

  • Loading branch information...
isaacs committed Mar 9, 2012
1 parent 66db8b2 commit dbae7f2ad92a4427d7289c0227c74b0e74f9164e
Showing with 4 additions and 3 deletions.
  1. +4 −3 lib/utils/read-json.js
View
@@ -36,13 +36,13 @@ function readJson (jsonFile, opts, cb) {
, serverjs = null
, gypfile = null
- if (options.gypfile !== null && opts.gypfile !== undefined) {
+ if (opts.gypfile !== null && opts.gypfile !== undefined) {
gypfile = opts.gypfile
next()
} else {
fs.readFile( path.join(path.dirname(jsonFile), "bindings.gyp")
, function (er, data) {
- opts.gypfile = !er
+ gypfile = opts.gypfile = !er
next()
})
}
@@ -349,7 +349,8 @@ function processObject (opts, cb) { return function (er, json) {
if (opts.gypfile && !json.prebuilt) {
log.verbose([json.prebuilt, opts], "has bindings.gyp")
if (!scripts.install && !scripts.preinstall) {
- scripts.preinstall = "node-gyp clean || (exit 0); node-gyp configure ; node-gyp build"
+ scripts.preinstall = "node-gyp clean || (exit 0)"
+ scripts.install = "node-gyp configure && node-gyp build"
json.scripts = scripts
}
}

0 comments on commit dbae7f2

Please sign in to comment.