gphoto2-pkgcfg.patch 2.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475
  1. --- libgphoto2-2.4.1/gphoto2-config.in.pkgcfg 2007-07-27 02:36:23.000000000 +0200
  2. +++ libgphoto2-2.4.1/gphoto2-config.in 2007-07-31 12:21:14.000000000 +0200
  3. @@ -1,11 +1,5 @@
  4. #! /bin/sh
  5. -# leave these definitions here
  6. -# they are required for correct interpolation of
  7. -# @libdir@ and @includedir@ later on
  8. -prefix="@prefix@"
  9. -exec_prefix="@exec_prefix@"
  10. -
  11. usage()
  12. {
  13. cat <<EOF
  14. @@ -13,7 +7,7 @@ Usage: gphoto2-config [OPTION]
  15. Known values for OPTION are:
  16. - --prefix=DIR change libgphoto2 prefix [default ${prefix}]
  17. + --prefix print libgphoto2 prefix
  18. --libs print library linking information
  19. --cflags print pre-processor and compiler flags
  20. --help display this help and exit
  21. @@ -55,11 +49,11 @@ while test $# -gt 0; do
  22. ;;
  23. --cflags)
  24. - echo "-I@includedir@/gphoto2"
  25. + pkg-config --cflags libgphoto2
  26. ;;
  27. --libs)
  28. - echo "-L@libdir@" -lgphoto2 -lgphoto2_port -lm
  29. + pkg-config --libs libgphoto2
  30. ;;
  31. *)
  32. --- libgphoto2-2.4.1/libgphoto2_port/gphoto2-port-config.in.pkgcfg 2007-07-27 02:36:16.000000000 +0200
  33. +++ libgphoto2-2.4.1/libgphoto2_port/gphoto2-port-config.in 2007-07-31 12:21:14.000000000 +0200
  34. @@ -1,11 +1,5 @@
  35. #! /bin/sh
  36. -# leave these definitions here
  37. -# they are required for correct interpolation of
  38. -# @libdir@ and @includedir@ later on
  39. -prefix="@prefix@"
  40. -exec_prefix="@exec_prefix@"
  41. -
  42. usage()
  43. {
  44. cat <<EOF
  45. @@ -13,7 +7,7 @@ Usage: gphoto2-port-config [OPTION]
  46. Known values for OPTION are:
  47. - --prefix=DIR change libgphoto2-port prefix [default ${prefix}]
  48. + --prefix print libgphoto2-port prefix
  49. --libs print library linking information
  50. --cflags print pre-processor and compiler flags
  51. --help display this help and exit
  52. @@ -55,11 +49,11 @@ while test $# -gt 0; do
  53. ;;
  54. --cflags)
  55. - echo "-I@includedir@/gphoto2"
  56. + pkg-config --cflags libgphoto2_port
  57. ;;
  58. --libs)
  59. - echo "-L@libdir@" -lgphoto2_port
  60. + pkg-config --libs libgphoto2_port
  61. ;;
  62. *)