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.

71 lines
2.4 KiB

  1. diff -ruN vobcopy-0.5.14/Makefile vobcopy-0.5.14-new/Makefile
  2. --- vobcopy-0.5.14/Makefile 2004-11-22 20:11:49.000000000 +0100
  3. +++ vobcopy-0.5.14-new/Makefile 2005-05-23 09:44:08.000000000 +0200
  4. @@ -6,7 +6,7 @@
  5. #PREFIX += /usr/local
  6. #BINDIR = ${PREFIX}/bin
  7. #MANDIR = ${PREFIX}/man
  8. -PREFIX += /usr/local
  9. +PREFIX += /usr
  10. BINDIR = ${PREFIX}/bin
  11. MANDIR = ${PREFIX}/man
  12. LFS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
  13. diff -ruN vobcopy-0.5.14/configure.sh vobcopy-0.5.14-new/configure.sh
  14. --- vobcopy-0.5.14/configure.sh 2004-11-22 20:10:37.000000000 +0100
  15. +++ vobcopy-0.5.14-new/configure.sh 2005-05-23 09:44:51.000000000 +0200
  16. @@ -48,7 +48,7 @@
  17. fi
  18. if [ "$1" != "${1%help}" ]; then
  19. - echo "--prefix=PREFIX install architecture-independent files in PREFIX [/usr/local]"
  20. + echo "--prefix=PREFIX install architecture-independent files in PREFIX [/usr]"
  21. echo "--bindir=DIR user executables in DIR [PREFIX/bin]"
  22. echo "--mandir=DIR man documentation in DIR [PREFIX/bin]"
  23. echo "--with-dvdread-libs=DIR directory where dvdread lib (dvd_reader.h) is installed"
  24. @@ -61,7 +61,7 @@
  25. if [ -z $prefix_provided ]
  26. then
  27. - prefix=/usr/local
  28. + prefix=/usr
  29. fi
  30. if [ -z $mandir_provided ]
  31. @@ -79,7 +79,7 @@
  32. if [ -z $libs_dir_provided ]
  33. then
  34. - if [ ! -e /usr/local/include/dvdread ]; then
  35. + if [ ! -e /usr/include/dvdread ]; then
  36. if [ ! -e /usr/include/dvdread ]; then #muss hier das then hin??
  37. echo "Do you have libdvdread installed? I (the script) can't
  38. find it"
  39. @@ -95,8 +95,8 @@
  40. fi
  41. else
  42. echo "libdvdread found"
  43. - libs_dir=/usr/local/
  44. -# libs_dir=/usr/local/include
  45. + libs_dir=/usr/
  46. +# libs_dir=/usr/include
  47. fi
  48. else
  49. # Remove the following if...fi if the program complains about non-existing
  50. @@ -134,7 +134,7 @@
  51. # `sysctl -n kern.osreldate 2> /dev/null` -lt 500041 ]; then
  52. if [ `uname -s` = FreeBSD ]; then
  53. if [ `sysctl -n kern.osreldate 2> /dev/null` -lt 500041 ]; then
  54. - LDFLAGS="LDFLAGS += -ldvdread -L/usr/local/lib -lgnugetopt"
  55. + LDFLAGS="LDFLAGS += -ldvdread -L/usr/lib -lgnugetopt"
  56. else
  57. LDFLAGS="LDFLAGS += -ldvdread -L$libs_dir/lib"
  58. fi
  59. @@ -155,7 +155,7 @@
  60. #below here are variable definitions. They get substituted in the (CC) and
  61. #stuff places.
  62. CC ?= gcc
  63. -#PREFIX += /usr/local
  64. +#PREFIX += /usr
  65. #BINDIR = \${PREFIX}/bin
  66. #MANDIR = \${PREFIX}/man
  67. PREFIX += $prefix