]>
Commit | Line | Data |
---|---|---|
d7dc8e14 JB |
1 | --- QScintilla-gpl-2.8.4/Python/configure.py.orig 2014-11-04 16:22:47.229532126 +0100 |
2 | +++ QScintilla-gpl-2.8.4/Python/configure.py 2014-11-07 22:03:55.811128882 +0100 | |
d86befc1 JB |
3 | @@ -278,7 +278,7 @@ |
4 | return None | |
5 | ||
6 | path = os.path.join(target_configuration.qsci_sip_dir, 'Qsci') | |
7 | - files = glob.glob('sip/*.sip') | |
8 | + files = glob.glob(os.path.join(target_configuration.src_dir, 'sip/*.sip')) | |
9 | ||
10 | return path, files | |
11 | ||
12 | @@ -1257,7 +1257,7 @@ | |
5391f258 JR |
13 | # any '-I' needed appears first. |
14 | pkg_root = os.path.dirname(os.path.abspath(__file__)) | |
d86befc1 | 15 | |
5391f258 JR |
16 | - sip_file = module_config.get_sip_file(target_config) |
17 | + sip_file = os.path.join(target_config.src_dir, module_config.get_sip_file(target_config)) | |
d86befc1 | 18 | |
5391f258 JR |
19 | head, tail = os.path.split(sip_file) |
20 | while head: | |
d86befc1 | 21 | @@ -1611,8 +1611,11 @@ |
5391f258 | 22 | arguments. pkg_config is the package configuration. |
d86befc1 JB |
23 | """ |
24 | ||
25 | + src_dir = os.path.dirname(os.path.abspath(__file__)) | |
26 | + | |
27 | # Create the default target configuration. | |
5391f258 | 28 | target_config = _TargetConfiguration(pkg_config) |
d86befc1 JB |
29 | + target_config.src_dir = src_dir |
30 | ||
31 | # Parse the command line. | |
5391f258 | 32 | p = _create_optparser(target_config, pkg_config) |