summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-01-23 00:45:13 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-01-23 00:45:13 +0000
commita5203938aa08ae901dc0383848afe13272d345d6 (patch)
tree28ddd3748000e80c2d474f80e41928c68dab75ac
parent87d72726273d21a3e61b68968c0be68762dc1ccb (diff)
downloadxine-lib-a5203938aa08ae901dc0383848afe13272d345d6.tar.gz
xine-lib-a5203938aa08ae901dc0383848afe13272d345d6.tar.bz2
Fix xine-config bugs related to --prefix & --exec-prefix.
Output the values, and correctly set exec_prefix.
-rw-r--r--misc/xine-config11
1 files 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