$NetBSD: patch-aa,v 1.8 2013/09/05 15:27:42 drochner Exp $ --- configure.py.orig 2012-02-10 10:03:04.000000000 +0000 +++ configure.py @@ -19,6 +19,7 @@ import sys import os import glob import optparse +import imp from distutils import sysconfig import siputils @@ -211,7 +212,7 @@ def set_platform_directories(): plat_py_lib_dir = lib_dir + "/config" plat_bin_dir = sys.exec_prefix + "/bin" - plat_sip_dir = sys.prefix + "/share/sip" + plat_sip_dir = sys.prefix + "/share/sip%s" % sys.version[0:3] def patch_files(): @@ -264,7 +265,7 @@ def create_config(module, template, macr "sip_version": sip_version, "sip_version_str": sip_version_str, "platform": opts.platform, - "sip_bin": os.path.join(opts.sipbindir, "sip"), + "sip_bin": os.path.join(opts.sipbindir, "sip%s" % sys.version[0:3]), "sip_inc_dir": opts.sipincdir, "sip_mod_dir": opts.sipmoddir, "default_bin_dir": plat_bin_dir, @@ -297,11 +298,19 @@ def create_makefiles(macros): sipconfig.inform("Creating top level Makefile...") + pyc_file = "sipconfig.pyc" + pyc_dir = cfg.sip_mod_dir + try: + pyc_file = imp.cache_from_source("sipconfig.py") + pyc_dir = os.path.join(cfg.sip_mod_dir, "__pycache__") + except AttributeError: + pass + sipconfig.ParentMakefile( configuration=cfg, subdirs=["sipgen", "siplib"], - installs=(["sipconfig.py", os.path.join(src_dir, "sipdistutils.py")], - cfg.sip_mod_dir) + installs=[(["sipconfig.py", os.path.join(src_dir, "sipdistutils.py")], + cfg.sip_mod_dir), ([pyc_file], pyc_dir)] ).generate() sipconfig.inform("Creating sip code generator Makefile...")