summaryrefslogtreecommitdiff
path: root/misc/xine-config
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-01-23 00:52:10 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-01-23 00:52:10 +0000
commit2f9b558e6ff6f599e4e6ef3422f48b17c44f178b (patch)
treeedc508f1fbc1212a588b89d3bacbfe4acf8ca3e9 /misc/xine-config
parent0ca390809880469773d630963249a550ec3fa523 (diff)
parenta5203938aa08ae901dc0383848afe13272d345d6 (diff)
downloadxine-lib-2f9b558e6ff6f599e4e6ef3422f48b17c44f178b.tar.gz
xine-lib-2f9b558e6ff6f599e4e6ef3422f48b17c44f178b.tar.bz2
Merge from 1.1.
--HG-- rename : src/libmad/xine_mad_decoder.c => src/audio_dec/xine_mad_decoder.c
Diffstat (limited to 'misc/xine-config')
-rw-r--r--misc/xine-config11
1 files changed, 7 insertions, 4 deletions
diff --git a/misc/xine-config b/misc/xine-config
index 12424fbd3..9cb68a709 100644
--- a/misc/xine-config
+++ b/misc/xine-config
@@ -43,11 +43,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"
@@ -55,9 +55,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
;;
@@ -68,5 +71,5 @@ done
echo 'xine-config is DEPRECATED. Use pkg-config instead.' >&2
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