- updated to work with 3.0.3

Changed files:
    apache-mod_python-DESTDIR.patch -> 1.3
    apache-mod_python-no-compile.patch -> 1.2

diff --git a/apache-mod_python-DESTDIR.patch b/apache-mod_python-DESTDIR.patch
index f59250ce07df24cc05b82c0ec4d49a854fc87fd2..57dd719cf9d1d257d8be8d5b89e2c39f09d95ae6 100644 (file)
--- a/apache-mod_python-DESTDIR.patch
+++ b/apache-mod_python-DESTDIR.patch
@@ -1,30 +1,11 @@
-diff -Nur mod_python-3.0.1.orig/Makefile.in mod_python-3.0.1/Makefile.in
---- mod_python-3.0.1.orig/Makefile.in  Fri Nov  8 01:15:10 2002
-+++ mod_python-3.0.1/Makefile.in       Thu Feb 27 09:48:44 2003
-@@ -92,7 +92,8 @@
+--- mod_python-3.0.3/Makefile.in.orig  2003-06-11 22:17:54.386314384 +0000
++++ mod_python-3.0.3/Makefile.in       2003-06-11 22:18:17.801754696 +0000
+@@ -93,7 +93,7 @@

        @echo
        @echo "Performing DSO installation."
        @echo
 -      $(INSTALL) src/mod_python.so $(LIBEXECDIR)
        @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"
 +      $(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} -O $(PY_STD_LIB)/compileall.py $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
- 
- clean:
-       cd src && $(MAKE) clean

diff --git a/apache-mod_python-no-compile.patch b/apache-mod_python-no-compile.patch
index 46d3fdefe4a6bbdc6b821c26710ce27cb75e6939..25860fcf7f13c9b79b306448aefceb367c62346d 100644 (file)
--- a/apache-mod_python-no-compile.patch
+++ b/apache-mod_python-no-compile.patch
@@ -1,12 +1,21 @@
-diff -Nur mod_python-3.0.1.orig/Makefile.in mod_python-3.0.1/Makefile.in
---- mod_python-3.0.1.orig/Makefile.in  Thu Feb 27 09:55:00 2003
-+++ mod_python-3.0.1/Makefile.in       Thu Feb 27 09:59:39 2003
-@@ -108,8 +108,6 @@
-       do \
-               $(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 $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
+--- mod_python-3.0.3/Makefile.in.orig  2003-06-11 22:36:03.877686520 +0000
++++ mod_python-3.0.3/Makefile.in       2003-06-11 22:36:41.091029232 +0000
+@@ -104,13 +104,11 @@
+ 
+ install_py_lib:
+       cd dist && $(MAKE) install_py_lib
+-#     $(INSTALL) -d $(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; \
+-#     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
++      $(INSTALL) -d $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
++      @for f in `ls lib/python/mod_python/*.py`; \
++      do \
++              $(INSTALL) $$f $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python; \
++      done

  
  clean:
        cd src && $(MAKE) clean
  
  clean:
        cd src && $(MAKE) clean