2004-03-07 Marcus Brinkmann <[email protected]>

	* src/gpg-error-config.in (Options): Do not emit include and lib
	directory for prefix "/usr" or "".

2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 5926e0d..c92399b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
 
 	* configure.ac: Bumbed up LIBGPG_ERROR_LT_REVISON.
 
+	* src/gpg-error-config.in (Options): Do not emit include and lib
+	directory for prefix "/usr" or "".
+
 2004-03-01  Marcus Brinkmann  <[email protected]>
 
 	* configure.ac: Define CC_FOR_BUILD.
diff --git a/src/gpg-error-config.in b/src/gpg-error-config.in
index 22ae7cf..b58ddd5 100644
--- a/src/gpg-error-config.in
+++ b/src/gpg-error-config.in
@@ -57,10 +57,14 @@ 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
 	    ;;
 	--libs)
-            output="$output -L$libdir -lgpg-error"
+	    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
+		output="$output -L$libdir -lgpg-error"
+	    fi
 	    ;;
 	*)
             usage 1 1>&2