1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
$NetBSD: patch-aa,v 1.3 2005/11/22 18:50:30 drochner Exp $
--- configure.py.orig 2005-11-14 18:31:01.000000000 +0100
+++ configure.py
@@ -243,7 +243,7 @@ def set_platform_directories():
plat_bin_dir = sys.exec_prefix
plat_sip_dir = sys.prefix + "\\sip"
else:
- vers = "%d.%d" % ((py_version >> 16) & 0xff, (py_version >> 8) & 0xff)
+ vers = sys.version[0:3]
plat_py_site_dir = sys.prefix + "/lib/python" + vers
if py_version >= 0x020000:
@@ -252,7 +252,7 @@ def set_platform_directories():
plat_py_inc_dir = sys.prefix + "/include/python" + vers
plat_py_lib_dir = sys.prefix + "/lib/python" + vers + "/config"
plat_bin_dir = sys.exec_prefix + "/bin"
- plat_sip_dir = sys.prefix + "/share/sip"
+ plat_sip_dir = sys.prefix + "/share/sip%s" % vers
def create_config(module, template, macros):
@@ -268,7 +268,7 @@ def create_config(module, template, macr
content = {
"sip_version": sip_version,
"sip_version_str": sip_version_str,
- "sip_bin": os.path.join(opt_sipbindir, "sip"),
+ "sip_bin": os.path.join(opt_sipbindir, "sip%s" % sys.version[0:3]),
"sip_inc_dir": opt_sipincdir,
"sip_mod_dir": opt_sipmoddir,
"default_bin_dir": plat_bin_dir,
@@ -715,7 +715,7 @@ def create_makefiles():
sipconfig.ParentMakefile(
configuration=cfg,
subdirs=["sipgen", "siplib"],
- installs=(["sipconfig.py", "sipdistutils.py"], cfg.sip_mod_dir)
+ installs=(["sipconfig.py", "sipconfig.pyc", "sipdistutils.py"], cfg.sip_mod_dir)
).generate()
sipconfig.inform("Creating sip code generator Makefile...")
|
