From: Marcus Brinkmann <mb@g10code.com>
Date: Sun, 7 Mar 2004 17:41:43 +0000 (+0000)
Subject: 2004-03-07  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: gpgme-1.2.0@1385~475
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9db624b26ec6ed98896d6acd9bedc570d4bd3ed2;p=gpgme.git

2004-03-07  Marcus Brinkmann  <marcus@g10code.de>

	* gpgme-config.in: Do not emit include and lib directory for
	prefix "/usr" or "".
---

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index f027885..38f8f43 100644
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-07  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpgme-config.in: Do not emit include and lib directory for
+	prefix "/usr" or "".
+
 2004-03-03  Werner Koch  <wk@gnupg.org>
 
 	* engine-gpgsm.c (gpgsm_export_ext): Properly insert a space
diff --git a/trunk/gpgme/gpgme-config.in b/trunk/gpgme/gpgme-config.in
index 270f965..28f1448 100644
--- a/trunk/gpgme/gpgme-config.in
+++ b/trunk/gpgme/gpgme-config.in
@@ -78,7 +78,9 @@ while test $# -gt 0; do
 	    exit 0
 	    ;;
         --cflags)
-            output="$output -I$includedir"
+	    if test "x$includedir" != "x/usr/include" -a "x$includedir" != "x/include"; then
+		output="$output -I$includedir"
+	    fi
 	    case "$thread_module" in
 	        pthread)
 	            output="$output $cflags_pthread"
@@ -90,7 +92,9 @@ while test $# -gt 0; do
 	    output="$output $gpg_error_cflags"
 	    ;;
 	--libs)
-            output="$output -L$libdir"
+	    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
+		output="$output -L$libdir"
+	    fi
 	    case "$thread_module" in
 		pthread)
 	            output="$output -lgpgme-pthread $libs_pthread"