diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-23 00:52:10 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-23 00:52:10 +0000 |
| commit | 2f9b558e6ff6f599e4e6ef3422f48b17c44f178b (patch) | |
| tree | edc508f1fbc1212a588b89d3bacbfe4acf8ca3e9 /misc | |
| parent | 0ca390809880469773d630963249a550ec3fa523 (diff) | |
| parent | a5203938aa08ae901dc0383848afe13272d345d6 (diff) | |
| download | xine-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')
| -rw-r--r-- | misc/libxine.pc.in | 2 | ||||
| -rw-r--r-- | misc/xine-config | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/misc/libxine.pc.in b/misc/libxine.pc.in index cb66d6b19..a6565bad0 100644 --- a/misc/libxine.pc.in +++ b/misc/libxine.pc.in @@ -17,7 +17,7 @@ objcflags=@OBJCFLAGS@ Name: libxine Description: The xine engine library -Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@ +Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@@XINE_PATCH@ Requires: Libs: -L${libdir} -lxine Libs.private: @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@ 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 |