X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=yazpp-config.in;h=a76b6ec67829c70b80e1b7ea92a285f6a48249dd;hp=fd52071742d234e200797e53b958d4810eea18e1;hb=6ef0865af923965680547123856185d71f3e85ff;hpb=a5da4db2656f68ab009555adb8bd3b410f4ac3c0

diff --git a/yazpp-config.in b/yazpp-config.in
index fd52071..a76b6ec 100644
--- a/yazpp-config.in
+++ b/yazpp-config.in
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id: yazpp-config.in,v 1.2 2006-12-12 14:39:02 marc 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="@YAZINC@"
-    else
-	YAZPPINC="@YAZINC@ -I${yazppprefix}/include"
+    if test "$yazppprefix" != "/usr"; then
+	YAZPPINC="-I${yazppprefix}/include $YAZPPINC"
     fi
 fi