diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2012-09-04 17:02:20 +0400 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2012-09-04 17:02:20 +0400 |
| commit | 972cdf82f14c237577ed5031d9ce92d0c23910e4 (patch) | |
| tree | 530b3fba632b2b03d57d340d6c23ca6ddf4622b2 /Makefile | |
| parent | 19a432260cd2a2981c067c88f37f71206d23ccd2 (diff) | |
| parent | 9f57e422cf15fbd1abdaa7795d373058ea9ee133 (diff) | |
Merge remote-tracking branch 'origin/v0.8'
Conflicts:
deps/uv/include/uv.h
src/node_crypto.cc
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -22,11 +22,11 @@ endif # to check for changes. .PHONY: node node_g -node: config.gypi +node: config.gypi out/Makefile $(MAKE) -C out BUILDTYPE=Release V=$(V) ln -fs out/Release/node node -node_g: config.gypi +node_g: config.gypi out/Makefile $(MAKE) -C out BUILDTYPE=Debug V=$(V) ln -fs out/Debug/node node_g |