blob: 378c6dd212d55fe86e3f8c86540f4a298801e931 (
plain)
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
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
Install libpythonX.Y.a in /usr/lib instead of /usr/lib/pythonX.Y/config.
https://bugs.gentoo.org/show_bug.cgi?id=252372
http://bugs.python.org/issue6103
--- Makefile.pre.in
+++ Makefile.pre.in
@@ -902,6 +902,19 @@
fi; \
else true; \
fi
+ @if test -f $(LIBRARY) && test $(LIBRARY) != $(LDLIBRARY); then \
+ if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
+ if test "$(SO)" = .dll; then \
+ $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBDIR); \
+ else \
+ $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBDIR); \
+ $(RANLIB) $(DESTDIR)$(LIBDIR)/$(LIBRARY); \
+ fi; \
+ else \
+ echo "Skipped install of $(LIBRARY) - use make frameworkinstall"; \
+ fi; \
+ else true; \
+ fi
# Install the versioned manual page
altmaninstall:
@@ -1098,18 +1111,6 @@
else true; \
fi; \
done
- @if test -d $(LIBRARY); then :; else \
- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
- if test "$(SO)" = .dll; then \
- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
- else \
- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
- fi; \
- else \
- echo Skip install of $(LIBRARY) - use make frameworkinstall; \
- fi; \
- fi
$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
--- Misc/python-config.in
+++ Misc/python-config.in
@@ -46,11 +46,7 @@
elif opt in ('--libs', '--ldflags'):
libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
libs.append('-lpython'+pyver)
- # add the prefix/lib/pythonX.Y/config dir, but only if there is no
- # shared library in prefix/lib/.
if opt == '--ldflags':
- if not getvar('Py_ENABLE_SHARED'):
- libs.insert(0, '-L' + getvar('LIBPL'))
if not getvar('PYTHONFRAMEWORK'):
libs.extend(getvar('LINKFORSHARED').split())
print ' '.join(libs)
--- Modules/makesetup
+++ Modules/makesetup
@@ -89,7 +89,7 @@
then
ExtraLibDir=.
else
- ExtraLibDir='$(LIBPL)'
+ ExtraLibDir='$(LIBDIR)'
fi
ExtraLibs="-L$ExtraLibDir -lpython\$(VERSION)";;
esac
|
GitWeb
