Update to new ID URLs

[yazpp-moved-to-github.git] / yazpp-config.in

diff --git a/yazpp-config.in b/yazpp-config.in
index 4f362e3..a76b6ec 100644 (file)
--- a/yazpp-config.in
+++ b/yazpp-config.in
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id: yazpp-config.in,v 1.1 2006-03-29 13:14:13 adam Exp $
 yazppprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
@@ -71,12 +70,14 @@ 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="@YAZINC@ -I${yazpp_src_root}/include"
+    YAZPPINC="-I${yazpp_src_root}/include $YAZPPINC"
 else
 
     if test "$yazppprefix" = "/usr"; then
@@ -85,10 +86,8 @@ else
        YAZPPLIB="-L${yazppprefix}/lib ${libs_short} $yazlibs"
     fi
     YAZPPLALIB=$YAZPPLIB
-    if test "$yazppprefix" = "/usr"; then
-       YAZPPINC=
-    else
-       YAZPPINC="@YAZINC@ -I${yazppprefix}/include"
+    if test "$yazppprefix" != "/usr"; then
+       YAZPPINC="-I${yazppprefix}/include $YAZPPINC"
     fi
 fi