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
71
72
73
74
75
76
77
78
79
|
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_link-with-libpython-pic.dpatch by <jeremie.corbier@resel.enst-bretagne.fr>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix install path and make mod_python link against pythonX.X-pic.a.
@DPATCH@
diff -urNad libapache-mod-python~/Makefile.in libapache-mod-python/Makefile.in
--- libapache-mod-python~/Makefile.in 2006-08-01 10:20:11.000000000 +0200
+++ libapache-mod-python/Makefile.in 2006-08-01 14:05:34.000000000 +0200
@@ -82,7 +82,8 @@
@echo
@echo "Performing DSO installation."
@echo
- $(INSTALL) src/mod_python.so $(LIBEXECDIR)
+ $(INSTALL) -m 644 src/mod_python.so $(DESTDIR)$(LIBEXECDIR)
+ $(INSTALL) -m 644 debian/600mod_python.info $(DESTDIR)$(LIBEXECDIR)
@$(MAKE) install_py_lib
@echo
@echo "Now don't forget to edit your main config and add"
@@ -114,17 +115,17 @@
@echo
install_py_lib:
- $(INSTALL) -d $(PY_STD_LIB)/site-packages/mod_python
+ $(INSTALL) -d $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
@for f in `ls lib/python/mod_python/*.py`; \
do \
- $(INSTALL) $$f $(PY_STD_LIB)/site-packages/mod_python; \
+ $(INSTALL) -m 644 $$f $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python; \
done
- python $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
+ #python $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
clean:
cd src && $(MAKE) clean
rm -f core
distclean: clean
- rm -rf Makefile config.h config.status config.cache config.log
+ rm -rf Makefile src/Makefile Doc/Makefile config.h config.status config.cache config.log
diff -urNad libapache-mod-python~/configure.in libapache-mod-python/configure.in
--- libapache-mod-python~/configure.in 2006-08-01 10:20:11.000000000 +0200
+++ libapache-mod-python/configure.in 2006-08-01 14:04:50.000000000 +0200
@@ -242,12 +242,12 @@
if test -z "$PYTHON_SRC"; then
PyLIBP=${PyEXEC_INSTALLDIR}/lib/python${PyVERSION}
PyLIBPL=${PyLIBP}/config
- PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}.a
+ PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}-pic.a
PyLIBS=`grep "^LIB[[SMC]]=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
PyMODLIBS=`grep "^LOCALMODLIBS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
PY_LIBS="${PyPYTHONLIBS} ${PyLIBS} ${PyMODLIBS}"
else
- PyPYTHONLIBS=${PYTHON_SRC}/libpython${PyVERSION}.a
+ PyPYTHONLIBS=${PYTHON_SRC}/libpython${PyVERSION}-pic.a
if test ${PyVERSION} = "2.1"; then
PyLIBS=`grep "^LIB[[SMC]]=" ${PYTHON_SRC}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
PyMODLIBS=`grep "^LOCALMODLIBS=" ${PYTHON_SRC}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
diff -urNad libapache-mod-python~/src/Makefile.in libapache-mod-python/src/Makefile.in
--- libapache-mod-python~/src/Makefile.in 2006-08-01 10:20:11.000000000 +0200
+++ libapache-mod-python/src/Makefile.in 2006-08-01 14:04:50.000000000 +0200
@@ -52,7 +52,7 @@
INCLUDES=@INCLUDES@
LIBS=@LIBS@
LDFLAGS=@LDFLAGS@
-OPT=
+OPT= -fPIC -DEAPI
CFLAGS=$(OPT) $(INCLUDES)
srcdir=.
@@ -119,4 +119,4 @@
serverobject.o: serverobject.c
connobject.o: connobject.c
-# DO NOT DELETE THIS LINE
\ No newline at end of file
+# DO NOT DELETE THIS LINE
|
