diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-02-01 01:29:58 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-02-01 01:29:58 +0000 |
| commit | 1e70919700fde382d13f28f023ed1fa08cddf49a (patch) | |
| tree | 5382104078de65add6b99ef7189c0d81ff0dff48 /misc | |
| parent | 9524b748a27734b4cdee2d348adfd0606abdedda (diff) | |
| parent | 4c48996da5a13a135338e745157c45f351300540 (diff) | |
| download | xine-lib-1e70919700fde382d13f28f023ed1fa08cddf49a.tar.gz xine-lib-1e70919700fde382d13f28f023ed1fa08cddf49a.tar.bz2 | |
Merge from 1.1, discarding es.po changes.
--HG--
rename : misc/xine-config => misc/xine-config.in
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/Makefile.am | 1 | ||||
| -rw-r--r-- | misc/xine-config.in (renamed from misc/xine-config) | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/misc/Makefile.am b/misc/Makefile.am index a6b7d2921..cd013b752 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -14,7 +14,6 @@ EXTRA_DIST = build_rpms.sh \ bin_SCRIPTS = xine-config -pkgconfigdir=$(libdir)/pkgconfig pkgconfig_DATA=libxine.pc fontdir = $(pkgdatadir)/fonts diff --git a/misc/xine-config b/misc/xine-config.in index 8962c8079..1492d739b 100644 --- a/misc/xine-config +++ b/misc/xine-config.in @@ -6,6 +6,11 @@ unset prefix unset exec_prefix unset args +export PKG_CONFIG_PATH="$(cat <<'EOF' +@XINE_PKGCONFIG_DIR@ +EOF +)${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH" + usage() { cat <<EOF |