diff -Naur yazpp-1.0.4/yazpp-config.in yazpp-1.0.4.tpg/yazpp-config.in
--- yazpp-1.0.4/yazpp-config.in	2007-04-13 10:26:57.000000000 +0000
+++ yazpp-1.0.4.tpg/yazpp-config.in	2007-12-27 21:29:54.000000000 +0000
@@ -1,18 +1,6 @@
 #!/bin/sh
 # $Id: yazpp-config.in,v 1.3 2007-04-13 10:26:57 adam Exp $
-yazppprefix=@prefix@
-yaz_echo_cflags=no
-yaz_echo_libs=no
 yaz_echo_help=no
-yaz_echo_tabs=no
-yaz_echo_source=yes
-yaz_echo_lalibs=no
-yazpp_src_root=@YAZPP_SRC_ROOT@
-yazpp_build_root=@YAZPP_BUILD_ROOT@
-
-yazlibs="@YAZLIB@ @LIBS@"
-yazlalibs="@YAZLALIB@ @LIBS@"
-YAZPPVERSION=@VERSION@
 
 usage()
 {
@@ -39,28 +27,22 @@
   esac
 
   case $1 in
-    --prefix=*)
-      yazppprefix=$optarg
-      ;;
     --prefix)
-      echo $yazppprefix
+      echo "@prefix@"
       exit 0
       ;;
     --version)
-      echo $YAZPPVERSION
+      echo "@VERSION@"
       exit 0
       ;;
     --cflags)
-      yaz_echo_cflags=yes
+      echo "-I@includedir@ @YAZ_CONFIG_CFLAGS@ @PTHREAD_CFLAGS@ @ICU_CPPFLAGS@"
       ;;
     --libs)
-      yaz_echo_libs=yes
-      ;;
-    --tabs)
-      yaz_echo_tabs=yes
+      echo "-L@libdir@ -lyazpp -lzoompp @LIBS@ @ICU_LIBS@"
       ;;
     --lalibs)
-      yaz_echo_lalibs=yes
+      echo "@libdir@/libyaz.la @LIBS@ @ICU_LIBS@"
       ;;
     -*)
       yaz_echo_help=yes
@@ -69,38 +51,6 @@
   shift
 done
 
-libs_short="-lyazpp -lzoompp"
-
-YAZPPINC="@YAZINC@"
-
-if test "$yaz_echo_source" = "yes"; then
-    YAZPPLIB="-L${yazpp_build_root}/src/.libs -lyazpp"
-    YAZPPLIB="$YAZPPLIB -L${yazpp_build_root}/zoom/.libs -lzoompp"
-    YAZPPLIB="$YAZPPLIB $yazlibs"
-    YAZPPLALIB="${yazpp_build_root}/src/libyazpp.la $yazlalibs"
-    YAZPPINC="-I${yazpp_src_root}/include $YAZPPINC"
-else
-
-    if test "$yazppprefix" = "/usr"; then
-	YAZPPLIB="${libs_short} $yazlibs"
-    else
-	YAZPPLIB="-L${yazppprefix}/lib ${libs_short} $yazlibs"
-    fi
-    YAZPPLALIB=$YAZPPLIB
-    if test "$yazppprefix" != "/usr"; then
-	YAZPPINC="-I${yazppprefix}/include $YAZPPINC"
-    fi
-fi
-
 if test "$yaz_echo_help" = "yes"; then
 	usage 1 1>&2
 fi
-if test "$yaz_echo_cflags" = "yes"; then
-	echo $YAZPPINC
-fi
-if test "$yaz_echo_libs" = "yes"; then
-	echo $YAZPPLIB
-fi
-if test "$yaz_echo_lalibs" = "yes"; then
-	echo $YAZPPLALIB
-fi