cc895d7
--- libusb-0.1.12/libusb-config.in.orig	2004-01-27 23:36:37.000000000 +0100
cc895d7
+++ libusb-0.1.12/libusb-config.in	2006-05-30 10:56:10.000000000 +0200
cc895d7
@@ -1,7 +1,6 @@
cc895d7
 #!/bin/sh
cc895d7
 
cc895d7
-prefix=@prefix@
cc895d7
-exec_prefix=@exec_prefix@
cc895d7
+prefix_set=no
cc895d7
 exec_prefix_set=no
cc895d7
 
cc895d7
 usage()
cc895d7
@@ -31,9 +30,7 @@
cc895d7
   case $1 in
cc895d7
     --prefix=*)
cc895d7
       prefix=$optarg
cc895d7
-      if test $exec_prefix_set = no ; then
cc895d7
-        exec_prefix=$optarg
cc895d7
-      fi
cc895d7
+      prefix_set=yes
cc895d7
       ;;
cc895d7
     --prefix)
cc895d7
       echo_prefix=yes
cc895d7
@@ -66,14 +63,22 @@
cc895d7
 done
cc895d7
 
cc895d7
 if test "$echo_prefix" = "yes"; then
cc895d7
-	echo $prefix
cc895d7
+	if test "$prefix_set" = "yes"; then
cc895d7
+		echo $prefix
cc895d7
+	else
cc895d7
+		pkg-config @PACKAGE_NAME@ --variable=prefix
cc895d7
+	fi
cc895d7
 fi
cc895d7
 if test "$echo_exec_prefix" = "yes"; then
cc895d7
-	echo $exec_prefix
cc895d7
+	if test "$exec_prefix_set" = "yes"; then
cc895d7
+		echo $exec_prefix
cc895d7
+	else
cc895d7
+		pkg-config @PACKAGE_NAME@ --variable=exec_prefix
cc895d7
+	fi
cc895d7
 fi
cc895d7
 if test "$echo_cflags" = "yes"; then
cc895d7
-	echo $includes
cc895d7
+	pkg-config @PACKAGE_NAME@ --cflags
cc895d7
 fi
cc895d7
 if test "$echo_libs" = "yes"; then
cc895d7
-	echo -L@libdir@ -lusb @OSLIBS@
cc895d7
+	pkg-config @PACKAGE_NAME@ --libs
cc895d7
 fi