From a5203938aa08ae901dc0383848afe13272d345d6 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Wed, 23 Jan 2008 00:45:13 +0000
Subject: Fix xine-config bugs related to --prefix & --exec-prefix. Output the
 values, and correctly set exec_prefix.

---
 misc/xine-config | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/misc/xine-config b/misc/xine-config
index f5993f471..3e67e5dc7 100644
--- a/misc/xine-config
+++ b/misc/xine-config
@@ -42,11 +42,11 @@ while test $# -gt 0; do
       if [ "$exec_prefix" = '' ]; then
         exec_prefix="$optarg"
       fi
+      args="$args${args+ }--variable=prefix"
       ;;
     --exec-prefix=*)
       exec_prefix="$optarg"
-      ;;
-    --prefix|--exec-prefix)
+      args="$args${args+ }--variable=exec_prefix"
       ;;
     --version)
       args="$args${args+ }--modversion"
@@ -54,9 +54,12 @@ while test $# -gt 0; do
     --cflags|--libs)
       args="$args${args+ }$1"
       ;;
-    --acflags|--plugindir|--datadir|--scriptdir|--localedir|--objcflags)
+    --prefix|--acflags|--plugindir|--datadir|--scriptdir|--localedir|--objcflags)
       args="$args${args+ }--variable=${1#--}"
       ;;
+    --exec-prefix)
+      args="$args${args+ }--variable=exec_prefix"
+      ;;
     *)
       usage 1 1>&2
       ;;
@@ -65,5 +68,5 @@ while test $# -gt 0; do
 done
 
 exec pkg-config "${prefix+--define-variable=prefix=}$prefix" \
-		"${exec_prefix+--define-variable=exc_prefix=}$exec_prefix" \
+		"${exec_prefix+--define-variable=exec_prefix=}$exec_prefix" \
 		$args libxine
-- 
cgit v1.2.3