--- gwenhywfar-2.3.0/gwenhywfar-config.in.in.pkgconfig	2006-04-03 18:34:47.000000000 -0400
+++ gwenhywfar-2.3.0/gwenhywfar-config.in.in	2006-09-05 10:42:35.000000000 -0400
@@ -1,33 +1,27 @@
 # $Id: gwenhywfar-2.3.0-pkgconfig.patch,v 1.2 2006/09/05 15:12:41 notting Exp $
 # Author of this file: Martin Preuss<martin@libchipcard.de>
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
-
-libdir=@libdir@
-
 result=""
 
 for d in $*; do
     case $d in
 	--includes)
-	    result="$result -I@gwenhywfar_headerdir@"
+	    result="$result $(pkg-config --cflags gwenhywfar)"
 	    ;;
 	--libraries)
-	    result="$result @gwenhywfar_ldflags@ @gwenhywfar_libs@"
+	    result="$result $(pkg-config --libs gwenhywfar)"
 	    ;;
 	--libraries++)
-	    result="$result @gwenhywfar_ldflags@ @gwenhywfar_libspp@"
+	    result="$result $(pkg-config --libs-only-L gwenhywfar) @gwenhywfar_libspp@"
 	    ;;
 	--libraries-ui)
-	    result="$result @gwenhywfar_ldflags@ @gwenhywfar_libsui@"
+	    result="$result $(pkg-config --libs-only-L gwenhywfar) @gwenhywfar_libsui@"
 	    ;;
 	--headers)
-	    result="$result @gwenhywfar_headerdir@/gwenhywfar"
+	    result="$result $(pkg-config --cflags gwenhywfar)"
 	    ;;
 	--plugins)
-	    result="$result @gwenhywfar_plugindir@"
+	    result="$result $(pkg-config --variable=plugindir gwenhywfar)"
 	    ;;
 	--vmajor)
 	    result="$result @GWENHYWFAR_VERSION_MAJOR@"
--- gwenhywfar-2.3.0/gwenhywfar.pc.in.foo	2006-09-05 10:58:08.000000000 -0400
+++ gwenhywfar-2.3.0/gwenhywfar.pc.in	2006-09-05 10:58:29.000000000 -0400
@@ -22,5 +22,4 @@
 
 Version: @VERSION@
 Libs: @gwenhywfar_ldflags@ @gwenhywfar_libs@
-Cflags: -I@gwenhywfar_headerdir@
-
+Cflags: -I@gwenhywfar_headerdir@ -I@libdir@/gwenhywfar/include