From af0f83daa34eacd872aaf54b5364f76145063854 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Tue, 31 Jul 2012 23:54:54 +0000
Subject: [PATCH] More portable generation of pkg-config definition files

---
 data/cpp.pc.in    |  2 +-
 data/pkgconfig.sh | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/data/cpp.pc.in b/data/cpp.pc.in
index ae669da..472d40d 100644
--- a/data/cpp.pc.in
+++ b/data/cpp.pc.in
@@ -8,4 +8,4 @@ Description: DeforaOS Development code pre-processor
 Version: @VERSION@
 Requires: libSystem
 Cflags: -I${includedir}
-Libs: -Wl,-R${libdir} -L${libdir} -lcpp
+Libs: -L${libdir} @RPATH@ -lcpp
diff --git a/data/pkgconfig.sh b/data/pkgconfig.sh
index 01f2ce7..cafa6ac 100755
--- a/data/pkgconfig.sh
+++ b/data/pkgconfig.sh
@@ -40,8 +40,8 @@ SED="sed"
 #debug
 _debug()
 {
-	echo $@ 1>&2
-	$@
+	echo "$@" 1>&2
+	"$@"
 }
 
 
@@ -99,9 +99,18 @@ while [ $# -gt 0 ]; do
 		continue
 	fi
 
+	#portability
+	RPATH="-Wl,-rpath-link,\${libdir} -Wl,-rpath,\${libdir}"
+	case $(uname -s) in
+		Darwin)
+			RPATH=
+			;;
+	esac
+
 	#create
-	$DEBUG $SED -e "s,@PREFIX@,$PREFIX," \
-			-e "s,@VERSION@,$VERSION," "$target.in" > "$target"
+	$DEBUG $SED -e "s:@PREFIX@:$PREFIX:" \
+			-e "s:@VERSION@:$VERSION:" \
+			-e "s:@RPATH@:$RPATH:" -- "$target.in" > "$target"
 	if [ $? -ne 0 ]; then
 		$DEBUG $RM -- "$target"
 		exit 2