17126
|
1 |
--- Python-2.6.4/Lib/distutils/command/build_ext.py.isalibs 2009-10-14 10:17:34.000000000 +1300
|
|
2 |
+++ Python-2.6.4/Lib/distutils/command/build_ext.py 2009-12-02 15:52:48.646454213 +1300
|
|
3 |
@@ -636,6 +636,8 @@
|
|
4 |
modpath = fullname.split('.')
|
|
5 |
filename = self.get_ext_filename(ext_name)
|
|
6 |
filename = os.path.split(filename)[-1]
|
|
7 |
+ if sys.maxint != 2147483647L:
|
|
8 |
+ filename = os.path.join("64", filename)
|
|
9 |
|
|
10 |
if not self.inplace:
|
|
11 |
# no further work needed
|
|
12 |
@@ -677,7 +679,13 @@
|
|
13 |
so_ext = get_config_var('SO')
|
|
14 |
if os.name == 'nt' and self.debug:
|
|
15 |
return apply(os.path.join, ext_path) + '_d' + so_ext
|
|
16 |
- return os.path.join(*ext_path) + so_ext
|
|
17 |
+ # .so extensions are word-size specific
|
|
18 |
+ path = apply(os.path.join, ext_path)
|
|
19 |
+ if sys.maxint == 2147483647L:
|
|
20 |
+ return path + so_ext
|
|
21 |
+ dirname = os.path.dirname(path);
|
|
22 |
+ basename = os.path.basename(path);
|
|
23 |
+ return os.path.join(dirname, "64", basename + so_ext)
|
|
24 |
|
|
25 |
def get_export_symbols (self, ext):
|
|
26 |
"""Return the list of symbols that a shared extension has to
|
|
27 |
--- Python-2.6.4/Python/import.c.isalibs 2009-09-17 08:06:36.000000000 +1200
|
|
28 |
+++ Python-2.6.4/Python/import.c 2009-12-02 15:46:25.143803213 +1300
|
|
29 |
@@ -1191,6 +1191,57 @@
|
|
30 |
static int find_init_module(char *); /* Forward */
|
|
31 |
static struct filedescr importhookdescr = {"", "", IMP_HOOK};
|
|
32 |
|
|
33 |
+#ifdef HAVE_STAT
|
|
34 |
+static char *
|
|
35 |
+insert_64dir(char *buf, size_t buflen)
|
|
36 |
+{
|
|
37 |
+ char *base;
|
|
38 |
+ char *cp;
|
|
39 |
+ size_t blen;
|
|
40 |
+
|
|
41 |
+ if ((blen = strlen(buf)) == 0)
|
|
42 |
+ return (NULL);
|
|
43 |
+
|
|
44 |
+ cp = &buf[blen - 1];
|
|
45 |
+ while (cp != buf && *cp != SEP)
|
|
46 |
+ cp--;
|
|
47 |
+
|
|
48 |
+ if (cp != buf)
|
|
49 |
+ cp++;
|
|
50 |
+
|
|
51 |
+ if (blen + strlen("64/") + 1 >= buflen)
|
|
52 |
+ return NULL;
|
|
53 |
+
|
|
54 |
+ base = strdup(cp);
|
|
55 |
+ sprintf(cp, "64%c%s", SEP, base);
|
|
56 |
+ free(base);
|
|
57 |
+
|
|
58 |
+ return buf;
|
|
59 |
+}
|
|
60 |
+
|
|
61 |
+/*
|
|
62 |
+ * If we're on a 64-bit platform, modify lookups for shared object files.
|
|
63 |
+ */
|
|
64 |
+static size_t modify_path(struct filedescr *fdp, char *buf, size_t buflen)
|
|
65 |
+{
|
|
66 |
+ struct stat statbuf;
|
|
67 |
+
|
|
68 |
+ if (sizeof(void *) != 8)
|
|
69 |
+ return 0;
|
|
70 |
+
|
|
71 |
+ if (stat(buf, &statbuf) == 0 && S_ISDIR(statbuf.st_mode))
|
|
72 |
+ return 0;
|
|
73 |
+
|
|
74 |
+ if (fdp->type != C_EXTENSION)
|
|
75 |
+ return 0;
|
|
76 |
+
|
|
77 |
+ if (insert_64dir(buf, buflen) == NULL)
|
|
78 |
+ return 0;
|
|
79 |
+
|
|
80 |
+ return strlen("64/");
|
|
81 |
+}
|
|
82 |
+#endif
|
|
83 |
+
|
|
84 |
static struct filedescr *
|
|
85 |
find_module(char *fullname, char *subname, PyObject *path, char *buf,
|
|
86 |
size_t buflen, FILE **p_fp, PyObject **p_loader)
|
|
87 |
@@ -1208,11 +1259,10 @@
|
|
88 |
static struct filedescr fd_builtin = {"", "", C_BUILTIN};
|
|
89 |
static struct filedescr fd_package = {"", "", PKG_DIRECTORY};
|
|
90 |
char name[MAXPATHLEN+1];
|
|
91 |
-#if defined(PYOS_OS2)
|
|
92 |
size_t saved_len;
|
|
93 |
size_t saved_namelen;
|
|
94 |
char *saved_buf = NULL;
|
|
95 |
-#endif
|
|
96 |
+
|
|
97 |
if (p_loader != NULL)
|
|
98 |
*p_loader = NULL;
|
|
99 |
|
|
100 |
@@ -1431,15 +1481,19 @@
|
|
101 |
}
|
|
102 |
#endif
|
|
103 |
#endif
|
|
104 |
-#if defined(PYOS_OS2)
|
|
105 |
+
|
|
106 |
/* take a snapshot of the module spec for restoration
|
|
107 |
* after the 8 character DLL hackery
|
|
108 |
*/
|
|
109 |
saved_buf = strdup(buf);
|
|
110 |
saved_len = len;
|
|
111 |
saved_namelen = namelen;
|
|
112 |
-#endif /* PYOS_OS2 */
|
|
113 |
+
|
|
114 |
for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
|
|
115 |
+#ifdef HAVE_STAT
|
|
116 |
+ len += modify_path(fdp, buf, buflen);
|
|
117 |
+#endif
|
|
118 |
+
|
|
119 |
#if defined(PYOS_OS2) && defined(HAVE_DYNAMIC_LOADING)
|
|
120 |
/* OS/2 limits DLLs to 8 character names (w/o
|
|
121 |
extension)
|
|
122 |
@@ -1480,21 +1534,18 @@
|
|
123 |
fp = NULL;
|
|
124 |
}
|
|
125 |
}
|
|
126 |
-#if defined(PYOS_OS2)
|
|
127 |
+
|
|
128 |
/* restore the saved snapshot */
|
|
129 |
strcpy(buf, saved_buf);
|
|
130 |
len = saved_len;
|
|
131 |
namelen = saved_namelen;
|
|
132 |
-#endif
|
|
133 |
}
|
|
134 |
-#if defined(PYOS_OS2)
|
|
135 |
/* don't need/want the module name snapshot anymore */
|
|
136 |
if (saved_buf)
|
|
137 |
{
|
|
138 |
free(saved_buf);
|
|
139 |
saved_buf = NULL;
|
|
140 |
}
|
|
141 |
-#endif
|
|
142 |
Py_XDECREF(copy);
|
|
143 |
if (fp != NULL)
|
|
144 |
break;
|
|
145 |
--- Python-2.6.4/Python/importdl.h.isalibs 2002-12-31 11:08:05.000000000 +1300
|
|
146 |
+++ Python-2.6.4/Python/importdl.h 2009-12-02 15:46:25.144470995 +1300
|
|
147 |
@@ -31,8 +31,9 @@
|
|
148 |
extern PyObject *_PyImport_LoadDynamicModule(char *name, char *pathname,
|
|
149 |
FILE *);
|
|
150 |
|
|
151 |
-/* Max length of module suffix searched for -- accommodates "module.slb" */
|
|
152 |
-#define MAXSUFFIXSIZE 12
|
|
153 |
+/* Max length of module suffix searched for -- accommodates "module.slb"
|
|
154 |
+ and "64/" */
|
|
155 |
+#define MAXSUFFIXSIZE 15
|
|
156 |
|
|
157 |
#ifdef MS_WINDOWS
|
|
158 |
#include <windows.h>
|
|
159 |
--- Python-2.6.4/configure.in.isalibs 2009-09-30 02:01:59.000000000 +1300
|
|
160 |
+++ Python-2.6.4/configure.in 2009-12-02 15:46:25.140023688 +1300
|
14736
|
161 |
@@ -17,8 +17,44 @@
|
|
162 |
AH_TOP([
|
|
163 |
#ifndef Py_PYCONFIG_H
|
|
164 |
#define Py_PYCONFIG_H
|
|
165 |
+
|
|
166 |
])
|
|
167 |
AH_BOTTOM([
|
|
168 |
+
|
|
169 |
+#include <sys/isa_defs.h>
|
|
170 |
+
|
|
171 |
+/*
|
|
172 |
+ * Python originally defined these statically, which prevents a 32-64 python
|
|
173 |
+ * from working at all.
|
|
174 |
+ */
|
|
175 |
+
|
|
176 |
+#define SIZEOF_SHORT 2
|
|
177 |
+#define SIZEOF_INT 4
|
|
178 |
+#define SIZEOF_LONG_LONG 8
|
|
179 |
+#define SIZEOF_FPOS_T 8
|
|
180 |
+#define SIZEOF_OFF_T 8
|
|
181 |
+#define SIZEOF_PTHREAD_T 4
|
|
182 |
+
|
|
183 |
+#ifdef _LP64
|
|
184 |
+#define SIZEOF_LONG 8
|
|
185 |
+#define SIZEOF_UINTPTR_T 8
|
|
186 |
+#define SIZEOF_VOID_P 8
|
|
187 |
+#define SIZEOF_TIME_T 8
|
|
188 |
+#define SIZEOF_SIZE_T 8
|
|
189 |
+#define SIZEOF_LONG_DOUBLE 16
|
|
190 |
+#else
|
|
191 |
+#define SIZEOF_LONG 4
|
|
192 |
+#define SIZEOF_UINTPTR_T 4
|
|
193 |
+#define SIZEOF_VOID_P 4
|
|
194 |
+#define SIZEOF_TIME_T 4
|
|
195 |
+#define SIZEOF_SIZE_T 4
|
|
196 |
+#if defined(__i386)
|
|
197 |
+#define SIZEOF_LONG_DOUBLE 12
|
|
198 |
+#else
|
|
199 |
+#define SIZEOF_LONG_DOUBLE 16
|
|
200 |
+#endif
|
|
201 |
+#endif
|
|
202 |
+
|
|
203 |
/* Define the macros needed if on a UnixWare 7.x system. */
|
|
204 |
#if defined(__USLC__) && defined(__SCO_VERSION__)
|
|
205 |
#define STRICT_SYSV_CURSES /* Don't use ncurses extensions */
|
17126
|
206 |
@@ -65,6 +101,26 @@
|
14736
|
207 |
|
|
208 |
define_xopen_source=yes
|
|
209 |
|
|
210 |
+# AC_CHECK_SIZEOF without the AC_DEFINE_UNQUOTED
|
|
211 |
+AC_DEFUN([PY_CHECK_SIZEOF],
|
|
212 |
+[AS_LITERAL_IF([$1], [],
|
|
213 |
+ [AC_FATAL([$0: requires literal arguments])])dnl
|
|
214 |
+AC_CHECK_TYPE([$1], [], [], [$3])
|
|
215 |
+AC_CACHE_CHECK([size of $1], AS_TR_SH([ac_cv_sizeof_$1]),
|
|
216 |
+[if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
|
|
217 |
+ # The cast to unsigned long works around a bug in the HP C Compiler
|
|
218 |
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
|
|
219 |
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
|
|
220 |
+ # This bug is HP SR number 8606223364.
|
|
221 |
+ _AC_COMPUTE_INT([(long) (sizeof ($1))],
|
|
222 |
+ [AS_TR_SH([ac_cv_sizeof_$1])],
|
|
223 |
+ [AC_INCLUDES_DEFAULT([$3])],
|
|
224 |
+ [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
|
|
225 |
+else
|
|
226 |
+ AS_TR_SH([ac_cv_sizeof_$1])=0
|
|
227 |
+fi])dnl
|
|
228 |
+])# PY_CHECK_SIZEOF
|
|
229 |
+
|
|
230 |
# Arguments passed to configure.
|
|
231 |
AC_SUBST(CONFIG_ARGS)
|
|
232 |
CONFIG_ARGS="$ac_configure_args"
|
17126
|
233 |
@@ -1377,14 +1433,10 @@
|
14736
|
234 |
|
|
235 |
# Sizes of various common basic types
|
|
236 |
# ANSI C requires sizeof(char) == 1, so no need to check it
|
|
237 |
-AC_CHECK_SIZEOF(int, 4)
|
|
238 |
-AC_CHECK_SIZEOF(long, 4)
|
|
239 |
-AC_CHECK_SIZEOF(void *, 4)
|
|
240 |
AC_CHECK_SIZEOF(short, 2)
|
|
241 |
AC_CHECK_SIZEOF(float, 4)
|
|
242 |
AC_CHECK_SIZEOF(double, 8)
|
|
243 |
-AC_CHECK_SIZEOF(fpos_t, 4)
|
|
244 |
-AC_CHECK_SIZEOF(size_t, 4)
|
|
245 |
+AC_CHECK_SIZEOF(short)
|
|
246 |
AC_CHECK_SIZEOF(pid_t, 4)
|
|
247 |
|
|
248 |
AC_MSG_CHECKING(for long long support)
|
17126
|
249 |
@@ -1394,9 +1446,6 @@
|
14736
|
250 |
have_long_long=yes
|
|
251 |
])
|
|
252 |
AC_MSG_RESULT($have_long_long)
|
|
253 |
-if test "$have_long_long" = yes ; then
|
|
254 |
-AC_CHECK_SIZEOF(long long, 8)
|
|
255 |
-fi
|
|
256 |
|
|
257 |
AC_MSG_CHECKING(for long double support)
|
|
258 |
have_long_double=no
|
17126
|
259 |
@@ -1404,10 +1453,6 @@
|
14736
|
260 |
AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define this if you have the type long double.])
|
|
261 |
have_long_double=yes
|
|
262 |
])
|
|
263 |
-AC_MSG_RESULT($have_long_double)
|
|
264 |
-if test "$have_long_double" = yes ; then
|
|
265 |
-AC_CHECK_SIZEOF(long double, 12)
|
|
266 |
-fi
|
|
267 |
|
|
268 |
AC_MSG_CHECKING(for _Bool support)
|
|
269 |
have_c99_bool=no
|
17126
|
270 |
@@ -1421,102 +1466,26 @@
|
14736
|
271 |
fi
|
|
272 |
|
|
273 |
AC_CHECK_TYPES(uintptr_t,
|
|
274 |
- [AC_CHECK_SIZEOF(uintptr_t, 4)],
|
|
275 |
+ [],
|
|
276 |
[], [#ifdef HAVE_STDINT_H
|
|
277 |
#include <stdint.h>
|
|
278 |
#endif])
|
|
279 |
|
|
280 |
|
|
281 |
-# Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>.
|
|
282 |
-AC_MSG_CHECKING(size of off_t)
|
|
283 |
-AC_CACHE_VAL(ac_cv_sizeof_off_t,
|
|
284 |
-[AC_TRY_RUN([#include <stdio.h>
|
|
285 |
+PY_CHECK_SIZEOF(off_t,4,[
|
|
286 |
+#include <stdio.h>
|
|
287 |
+#include <stdlib.h>
|
|
288 |
#include <sys/types.h>
|
|
289 |
-main()
|
|
290 |
-{
|
|
291 |
- FILE *f=fopen("conftestval", "w");
|
|
292 |
- if (!f) exit(1);
|
|
293 |
- fprintf(f, "%d\n", sizeof(off_t));
|
|
294 |
- exit(0);
|
|
295 |
-}],
|
|
296 |
-ac_cv_sizeof_off_t=`cat conftestval`,
|
|
297 |
-ac_cv_sizeof_off_t=0,
|
|
298 |
-ac_cv_sizeof_off_t=4)
|
|
299 |
-])
|
|
300 |
-AC_MSG_RESULT($ac_cv_sizeof_off_t)
|
|
301 |
-AC_DEFINE_UNQUOTED(SIZEOF_OFF_T, $ac_cv_sizeof_off_t,
|
|
302 |
-[The number of bytes in an off_t.])
|
|
303 |
-
|
|
304 |
-AC_MSG_CHECKING(whether to enable large file support)
|
|
305 |
-if test "$have_long_long" = yes -a \
|
|
306 |
- "$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \
|
|
307 |
- "$ac_cv_sizeof_long_long" -ge "$ac_cv_sizeof_off_t"; then
|
|
308 |
- AC_DEFINE(HAVE_LARGEFILE_SUPPORT, 1,
|
|
309 |
- [Defined to enable large file support when an off_t is bigger than a long
|
|
310 |
- and long long is available and at least as big as an off_t. You may need
|
|
311 |
- to add some flags for configuration and compilation to enable this mode.
|
|
312 |
- (For Solaris and Linux, the necessary defines are already defined.)])
|
|
313 |
- AC_MSG_RESULT(yes)
|
|
314 |
-else
|
|
315 |
- AC_MSG_RESULT(no)
|
|
316 |
-fi
|
|
317 |
-
|
|
318 |
-# AC_CHECK_SIZEOF() doesn't include <time.h>.
|
|
319 |
-AC_MSG_CHECKING(size of time_t)
|
|
320 |
-AC_CACHE_VAL(ac_cv_sizeof_time_t,
|
|
321 |
-[AC_TRY_RUN([#include <stdio.h>
|
|
322 |
-#include <time.h>
|
|
323 |
-main()
|
|
324 |
-{
|
|
325 |
- FILE *f=fopen("conftestval", "w");
|
|
326 |
- if (!f) exit(1);
|
|
327 |
- fprintf(f, "%d\n", sizeof(time_t));
|
|
328 |
- exit(0);
|
|
329 |
-}],
|
|
330 |
-ac_cv_sizeof_time_t=`cat conftestval`,
|
|
331 |
-ac_cv_sizeof_time_t=0,
|
|
332 |
-ac_cv_sizeof_time_t=4)
|
|
333 |
])
|
|
334 |
-AC_MSG_RESULT($ac_cv_sizeof_time_t)
|
|
335 |
-AC_DEFINE_UNQUOTED(SIZEOF_TIME_T, $ac_cv_sizeof_time_t,
|
|
336 |
-[The number of bytes in a time_t.])
|
|
337 |
|
|
338 |
+AC_MSG_CHECKING(whether to enable large file support)
|
|
339 |
|
|
340 |
-# if have pthread_t then define SIZEOF_PTHREAD_T
|
|
341 |
-ac_save_cc="$CC"
|
|
342 |
-if test "$ac_cv_kpthread" = "yes"
|
|
343 |
-then CC="$CC -Kpthread"
|
|
344 |
-elif test "$ac_cv_kthread" = "yes"
|
|
345 |
-then CC="$CC -Kthread"
|
|
346 |
-elif test "$ac_cv_pthread" = "yes"
|
|
347 |
-then CC="$CC -pthread"
|
|
348 |
-fi
|
|
349 |
-AC_MSG_CHECKING(for pthread_t)
|
|
350 |
-have_pthread_t=no
|
|
351 |
-AC_TRY_COMPILE([#include <pthread.h>], [pthread_t x; x = *(pthread_t*)0;], have_pthread_t=yes)
|
|
352 |
-AC_MSG_RESULT($have_pthread_t)
|
|
353 |
-if test "$have_pthread_t" = yes ; then
|
|
354 |
- # AC_CHECK_SIZEOF() doesn't include <pthread.h>.
|
|
355 |
- AC_MSG_CHECKING(size of pthread_t)
|
|
356 |
- AC_CACHE_VAL(ac_cv_sizeof_pthread_t,
|
|
357 |
- [AC_TRY_RUN([#include <stdio.h>
|
|
358 |
-#include <pthread.h>
|
|
359 |
- main()
|
|
360 |
- {
|
|
361 |
- FILE *f=fopen("conftestval", "w");
|
|
362 |
- if (!f) exit(1);
|
|
363 |
- fprintf(f, "%d\n", sizeof(pthread_t));
|
|
364 |
- exit(0);
|
|
365 |
- }],
|
|
366 |
- ac_cv_sizeof_pthread_t=`cat conftestval`,
|
|
367 |
- ac_cv_sizeof_pthread_t=0,
|
|
368 |
- ac_cv_sizeof_pthread_t=4)
|
|
369 |
- ])
|
|
370 |
- AC_MSG_RESULT($ac_cv_sizeof_pthread_t)
|
|
371 |
- AC_DEFINE_UNQUOTED(SIZEOF_PTHREAD_T, $ac_cv_sizeof_pthread_t,
|
|
372 |
- [The number of bytes in a pthread_t.])
|
|
373 |
-fi
|
|
374 |
-CC="$ac_save_cc"
|
|
375 |
+AC_DEFINE(HAVE_LARGEFILE_SUPPORT, 1,
|
|
376 |
+[Defined to enable large file support when an off_t is bigger than a long
|
|
377 |
+ and long long is available and at least as big as an off_t. You may need
|
|
378 |
+ to add some flags for configuration and compilation to enable this mode.
|
|
379 |
+ (For Solaris and Linux, the necessary defines are already defined.)])
|
|
380 |
+AC_MSG_RESULT(yes)
|
|
381 |
|
|
382 |
AC_MSG_CHECKING(for --enable-toolbox-glue)
|
|
383 |
AC_ARG_ENABLE(toolbox-glue,
|
17126
|
384 |
@@ -1810,12 +1779,6 @@
|
14736
|
385 |
if test -z "$CCSHARED"
|
|
386 |
then
|
|
387 |
case $ac_sys_system/$ac_sys_release in
|
|
388 |
- SunOS*) if test "$GCC" = yes;
|
|
389 |
- then CCSHARED="-fPIC";
|
|
390 |
- elif test `uname -p` = sparc;
|
|
391 |
- then CCSHARED="-xcode=pic32";
|
|
392 |
- else CCSHARED="-Kpic";
|
|
393 |
- fi;;
|
|
394 |
hp*|HP*) if test "$GCC" = yes;
|
|
395 |
then CCSHARED="-fPIC";
|
|
396 |
else CCSHARED="+z";
|
17126
|
397 |
@@ -3308,12 +3271,6 @@
|
14736
|
398 |
wchar_h="no"
|
|
399 |
)
|
|
400 |
|
|
401 |
-# determine wchar_t size
|
|
402 |
-if test "$wchar_h" = yes
|
|
403 |
-then
|
|
404 |
- AC_CHECK_SIZEOF(wchar_t, 4, [#include <wchar.h>])
|
|
405 |
-fi
|
|
406 |
-
|
|
407 |
AC_MSG_CHECKING(for UCS-4 tcl)
|
|
408 |
have_ucs4_tcl=no
|
|
409 |
AC_TRY_COMPILE([
|
17126
|
410 |
@@ -3344,6 +3301,11 @@
|
14736
|
411 |
ac_cv_wchar_t_signed=no,
|
|
412 |
ac_cv_wchar_t_signed=yes)])
|
|
413 |
AC_MSG_RESULT($ac_cv_wchar_t_signed)
|
|
414 |
+
|
|
415 |
+ PY_CHECK_SIZEOF(wchar_t, 4, [
|
|
416 |
+ #include <wchar.h>
|
|
417 |
+ #include <stdlib.h
|
|
418 |
+ ])
|
|
419 |
fi
|
|
420 |
|
|
421 |
AC_MSG_CHECKING(what type to use for unicode)
|
|
422 |
--- Python-2.6/Makefile.pre.in.isalibs 2008-09-06 10:59:17.000000000 +1200
|
|
423 |
+++ Python-2.6/Makefile.pre.in 2008-12-02 20:07:11.758494722 +1300
|
|
424 |
@@ -87,18 +87,18 @@
|
|
425 |
|
|
426 |
# Expanded directories
|
|
427 |
BINDIR= $(exec_prefix)/bin
|
|
428 |
-LIBDIR= $(exec_prefix)/lib
|
|
429 |
+LIBDIR= @libdir@
|
|
430 |
MANDIR= @mandir@
|
|
431 |
INCLUDEDIR= @includedir@
|
|
432 |
CONFINCLUDEDIR= $(exec_prefix)/include
|
|
433 |
SCRIPTDIR= $(prefix)/lib
|
|
434 |
|
|
435 |
# Detailed destination directories
|
|
436 |
-BINLIBDEST= $(LIBDIR)/python$(VERSION)
|
|
437 |
-LIBDEST= $(SCRIPTDIR)/python$(VERSION)
|
|
438 |
-INCLUDEPY= $(INCLUDEDIR)/python$(VERSION)
|
|
439 |
-CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION)
|
|
440 |
-LIBP= $(LIBDIR)/python$(VERSION)
|
|
441 |
+BINLIBDEST= $(exec_prefix)/lib/python$(VERSION)
|
|
442 |
+LIBDEST= $(SCRIPTDIR)/python$(VERSION)
|
|
443 |
+INCLUDEPY= $(INCLUDEDIR)/python$(VERSION)
|
|
444 |
+CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION)
|
|
445 |
+LIBP= $(exec_prefix)/lib/python$(VERSION)
|
|
446 |
|
|
447 |
# Symbols used for using shared libraries
|
|
448 |
SO= @SO@
|