From: Marcus Brinkmann <mb@g10code.com>
Date: Wed, 3 Sep 2003 20:58:38 +0000 (+0000)
Subject: 2003-09-03  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: gpgme-1.2.0@1385~545
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b1394a760e30af34c9f8e868ecd3c0e371214fde;p=gpgme.git

2003-09-03  Marcus Brinkmann  <marcus@g10code.de>

	* gpgme-config.in: Use $libdir, not @libdir@, for the echo
	command.
---

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 9be8f3f..58669e7 100644
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,5 +1,8 @@
 2003-09-03  Marcus Brinkmann  <marcus@g10code.de>
 
+	* gpgme-config.in: Use $libdir, not @libdir@, for the echo
+	command.
+
 	* gpgme-config.in: Rewritten.
 	* gpgme.m4: Rewritten.
 
diff --git a/trunk/gpgme/gpgme-config.in b/trunk/gpgme/gpgme-config.in
index 4e428db..b21013e 100644
--- a/trunk/gpgme/gpgme-config.in
+++ b/trunk/gpgme/gpgme-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-#    Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -36,12 +36,12 @@ usage()
     cat <<EOF
 Usage: gpgme-config [OPTIONS]
 Options:
+	[--thread={${thread_modules}}]
 	[--prefix]
 	[--exec-prefix]
 	[--version]
 	[--libs]
 	[--cflags]
-	[--thread={${thread_modules}}]
 EOF
     exit $1
 }
@@ -84,7 +84,7 @@ while test $# -gt 0; do
 	    output="$output $gpg_error_cflags"
 	    ;;
 	--libs)
-            output="$output -L@libdir@"
+            output="$output -L$libdir"
 	    case "$thread_module" in
 		pthread)
 	            output="$output -lgpgme-pthread $libs_pthread"