- for third version of mod_python, currently beta4.

Changed files:
    apache-mod_python-3-DESTDIR.patch -> 1.1
    apache-mod_python-3-static-lib-dir-fix.patch -> 1.1

diff --git a/apache-mod_python-3-DESTDIR.patch b/apache-mod_python-3-DESTDIR.patch
new file mode 100644 (file)
index 0000000..77ffb8a
--- /dev/null
+++ b/apache-mod_python-3-DESTDIR.patch
@@ -0,0 +1,30 @@
+--- Makefile.in.es     Fri Nov  1 13:32:49 2002
++++ Makefile.in        Fri Nov  1 13:34:47 2002
+@@ -92,7 +92,8 @@
+       @echo
+       @echo "Performing DSO installation."
+       @echo
+-      $(INSTALL) src/mod_python.so $(LIBEXECDIR)
++      $(INSTALL) -d $(DESTDIR)$(LIBEXECDIR)
++      $(INSTALL) src/mod_python.so $(DESTDIR)$(LIBEXECDIR)
+       @$(MAKE) install_py_lib
+       @echo
+       @echo "Now don't forget to edit your main config and add"
+@@ -102,13 +103,13 @@
+       @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) $$f $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python; \
+       done
+-      ${PYTHON_BIN} $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
+-      ${PYTHON_BIN} -O $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
++      ${PYTHON_BIN} $(PY_STD_LIB)/compileall.pyc $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
++      ${PYTHON_BIN} -O $(PY_STD_LIB)/compileall.pyc $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
+ 
+ clean:
+       cd src && $(MAKE) clean

diff --git a/apache-mod_python-3-static-lib-dir-fix.patch b/apache-mod_python-3-static-lib-dir-fix.patch
new file mode 100644 (file)
index 0000000..6196f97
--- /dev/null
+++ b/apache-mod_python-3-static-lib-dir-fix.patch
@@ -0,0 +1,12 @@
+--- configure.in       Fri Nov  1 01:13:47 2002
++++ configure.in1      Fri Nov  1 01:12:46 2002
+@@ -254,7 +254,8 @@
+ 
+ PyLIBP=${PyEXEC_INSTALLDIR}/lib/python${PyVERSION}
+ PyLIBPL=${PyLIBP}/config
+-PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}.a
++#PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}.a
++PyPYTHONLIBS=/usr/lib/libpython${PyVERSION}.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}"