From d6d3eaa858963f7eef9b946dba1d9e6f20ecee72 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Sun, 7 Mar 2004 17:41:43 +0000 Subject: [PATCH] 2004-03-07 Marcus Brinkmann * gpgme-config.in: Do not emit include and lib directory for prefix "/usr" or "". --- gpgme/ChangeLog | 5 +++++ gpgme/gpgme-config.in | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index f027885d..38f8f433 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,8 @@ +2004-03-07 Marcus Brinkmann + + * gpgme-config.in: Do not emit include and lib directory for + prefix "/usr" or "". + 2004-03-03 Werner Koch * engine-gpgsm.c (gpgsm_export_ext): Properly insert a space diff --git a/gpgme/gpgme-config.in b/gpgme/gpgme-config.in index 270f965c..28f14483 100644 --- a/gpgme/gpgme-config.in +++ b/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"