]>
Commit | Line | Data |
---|---|---|
4f264bd9 | 1 | --- wscript.orig 2011-02-21 11:43:43.000000000 -0700 |
2 | +++ wscript 2011-02-21 11:44:51.000000000 -0700 | |
3 | @@ -39,6 +39,12 @@ | |
4 | opt.tool_options('compiler_cxx') | |
5 | opt.tool_options('compiler_cc') | |
6 | opt.tool_options('misc') | |
7 | + opt.add_option( '--libdir' | |
8 | + , action='store' | |
9 | + , type='string' | |
10 | + , default=False | |
11 | + , help='Install into this libdir [Default: ${PREFIX}/lib]' | |
12 | + ) | |
13 | opt.add_option( '--debug' | |
14 | , action='store_true' | |
15 | , default=False | |
16 | @@ -208,6 +214,11 @@ | |
17 | ||
18 | o = Options.options | |
19 | ||
20 | + if o.libdir: | |
21 | + conf.env['LIBDIR'] = o.libdir | |
22 | + else: | |
23 | + conf.env['LIBDIR'] = conf.env['PREFIX'] + '/lib' | |
24 | + | |
25 | conf.env["USE_DEBUG"] = o.debug | |
26 | # Snapshot building does noet seem to work on cygwin and mingw32 | |
27 | conf.env["SNAPSHOT_V8"] = not o.without_snapshot and not sys.platform.startswith("win32") | |
28 | @@ -707,7 +718,7 @@ | |
29 | if bld.env["USE_DEBUG"]: | |
30 | dtrace_g = dtrace.clone("debug") | |
31 | ||
32 | - bld.install_files('${PREFIX}/lib/dtrace', 'src/node.d') | |
33 | + bld.install_files('${LIBDIR}/dtrace', 'src/node.d') | |
34 | ||
35 | if sys.platform.startswith("sunos"): | |
36 | # | |
37 | @@ -761,7 +772,7 @@ | |
38 | node.uselib = 'RT EV OPENSSL CARES EXECINFO DL KVM SOCKET NSL UTIL OPROFILE' | |
39 | node.add_objects = 'eio http_parser' | |
40 | if product_type_is_lib: | |
41 | - node.install_path = '${PREFIX}/lib' | |
42 | + node.install_path = '${LIBDIR}' | |
43 | node.vnum = "4.0.0" # FIXME: Should probably be based on VERSION | |
44 | else: | |
45 | node.install_path = '${PREFIX}/bin' | |
46 | @@ -819,7 +830,7 @@ | |
47 | bld.env.append_value('LINKFLAGS', '-Wl,--export-all-symbols') | |
48 | bld.env.append_value('LINKFLAGS', '-Wl,--out-implib,default/libnode.dll.a') | |
49 | bld.env.append_value('LINKFLAGS', '-Wl,--output-def,default/libnode.def') | |
50 | - bld.install_files('${PREFIX}/lib', "build/default/libnode.*") | |
51 | + bld.install_files('${LIBDIR}', "build/default/libnode.*") | |
52 | ||
53 | def subflags(program): | |
54 | x = { 'CCFLAGS' : " ".join(program.env["CCFLAGS"]).replace('"', '\\"') | |
55 | @@ -865,8 +876,8 @@ | |
56 | bld.install_files('${PREFIX}/share/man/man1/', 'doc/node.1') | |
57 | ||
58 | bld.install_files('${PREFIX}/bin/', 'tools/node-waf', chmod=0755) | |
59 | - bld.install_files('${PREFIX}/lib/node/wafadmin', 'tools/wafadmin/*.py') | |
60 | - bld.install_files('${PREFIX}/lib/node/wafadmin/Tools', 'tools/wafadmin/Tools/*.py') | |
61 | + bld.install_files('${LIBDIR}/node/wafadmin', 'tools/wafadmin/*.py') | |
62 | + bld.install_files('${LIBDIR}/node/wafadmin/Tools', 'tools/wafadmin/Tools/*.py') | |
63 | ||
64 | # create a pkg-config(1) file | |
65 | node_conf = bld.new_task_gen('subst', before="cxx") | |
66 | @@ -874,7 +885,7 @@ | |
67 | node_conf.target = 'tools/nodejs.pc' | |
68 | node_conf.dict = subflags(node) | |
69 | ||
70 | - bld.install_files('${PREFIX}/lib/pkgconfig', 'tools/nodejs.pc') | |
71 | + bld.install_files('${LIBDIR}/pkgconfig', 'tools/nodejs.pc') | |
72 | ||
73 | def shutdown(): | |
74 | Options.options.debug |