diff options
| author | isaacs <i@izs.me> | 2012-12-13 16:57:58 -0800 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-12-13 16:57:58 -0800 |
| commit | 77ed12fe7a16d3d97d637512db109f4273711bec (patch) | |
| tree | d4b7237231ab810e8dc5906204e5d861efce2773 /tools/install.py | |
| parent | 6cf68aead6886d397772ea176a9f5c35fdb63071 (diff) | |
| parent | 45cdb0e4c12d8f8e9450174ddd6ddad52a995831 (diff) | |
| download | android-node-v8-77ed12fe7a16d3d97d637512db109f4273711bec.tar.gz android-node-v8-77ed12fe7a16d3d97d637512db109f4273711bec.tar.bz2 android-node-v8-77ed12fe7a16d3d97d637512db109f4273711bec.zip | |
Merge remote-tracking branch 'ry/v0.8' into master
Conflicts:
AUTHORS
ChangeLog
deps/uv/test/test-spawn.c
deps/uv/uv.gyp
src/cares_wrap.cc
src/node.cc
src/node_version.h
test/simple/test-buffer.js
tools/gyp/pylib/gyp/common.py
tools/install.py
Diffstat (limited to 'tools/install.py')
| -rwxr-xr-x | tools/install.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/install.py b/tools/install.py index da4078b9cb..b6a75a9080 100755 --- a/tools/install.py +++ b/tools/install.py @@ -122,6 +122,11 @@ def files(action): # with dtrace support now (oracle's "unbreakable" linux) action(['src/node.d'], 'lib/dtrace/') + if 'freebsd' in sys.platform: + action(['doc/node.1'], 'man/man1/') + else: + action(['doc/node.1'], 'share/man/man1/') + if 'true' == variables.get('node_install_npm'): npm_files(action) def run(args): |