mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

57 lines
2.3 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/alessandro/php/php5/do-not-touch-httpd-conf.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- php-5.0.5/configure.orig 2005-09-13 22:02:51.000000000 +0200
  20. +++ php-5.0.5/configure 2005-09-13 22:00:52.000000000 +0200
  21. @@ -3672,7 +3672,7 @@
  22. \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
  23. $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
  24. -S SYSCONFDIR='$APXS_SYSCONFDIR' \
  25. - -i -a -n php5 $SAPI_SHARED"
  26. + -i -n php5 $SAPI_SHARED"
  27. fi
  28. fi
  29. @@ -4776,7 +4776,7 @@
  30. \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
  31. $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
  32. -S SYSCONFDIR='$APXS_SYSCONFDIR' \
  33. - -i -a -n php5"
  34. + -i -n php5"
  35. fi
  36. case $host_alias in
  37. @@ -5606,7 +5606,7 @@
  38. \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
  39. $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
  40. -S SYSCONFDIR='$APXS_SYSCONFDIR' \
  41. - -i -a -n php5"
  42. + -i -n php5"
  43. fi
  44. case $host_alias in
  45. @@ -6618,7 +6618,7 @@
  46. \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
  47. $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
  48. -S SYSCONFDIR='$APXS_SYSCONFDIR' \
  49. - -i -a -n php5 $SAPI_SHARED"
  50. + -i -n php5 $SAPI_SHARED"
  51. fi
  52. fi