diff options
Diffstat (limited to 'doc/man')
| -rw-r--r-- | doc/man/en/xine-config.1 | 34 | ||||
| -rw-r--r-- | doc/man/en/xine.5 | 3 |
2 files changed, 22 insertions, 15 deletions
diff --git a/doc/man/en/xine-config.1 b/doc/man/en/xine-config.1 index 3fe828166..af56fd844 100644 --- a/doc/man/en/xine-config.1 +++ b/doc/man/en/xine-config.1 @@ -13,25 +13,28 @@ xine\-config - script to get information about the installed version of libxine [\-\-plugindir] [\-\-datadir] [\-\-scriptdir] [\-\-localedir] .SH DESCRIPTION .PP +\fIxine\-config is DEPRECATED. Use pkg\-config instead.\fP +.PP \fIxine\-config\fP is a tool that is used to determine the compiler and linker flags that should be used to compile and link programs that use \fIlibxine\fP. It can also be used to determine -the directories where \fIlibxine\fP expects plugins and skins. -Finally, it's also used internally -by the .m4 macros for GNU autoconf that are included with \fIxine-lib\fP. -. +the directories where \fIlibxine\fP expects plugins. .SH OPTIONS -\fIxine\-config\fP accepts the following options: +\fIxine\-config\fP accepts the following options, passing them on (possibly +modified) to \fIpkg\-config libxine\fP: .TP 8 .B \-\-version +\-\-modversion +.br Print the currently installed version of \fIlibxine\fP on the standard output. .TP 8 .B \-\-libs -Print the linker flags that are necessary to link \fIlibxine\fP to a program. -.TP 8 +.TQ 8 .B \-\-cflags .TQ 8 .B \-\-objcflags +Passed on unmodified. +.br Print the compiler flags (for C and Objective C, respectively) that are necessary to compile a program that uses \fIlibxine\fP. .TP 8 @@ -44,21 +47,24 @@ necessary to compile a program that uses \fIlibxine\fP. .B \-\-scriptdir .TQ 8 .B \-\-localedir +\-\-variable=... +.br Print the directory where, respectively, \fIlibxine\fP binaries, plugins, data files, scripts and locale data are stored/expected. .TP 8 .B \-\-prefix=PREFIX +\-\-define\-variable=prefix=PREFIX +.br If specified, use PREFIX instead of the installation prefix that \fIxine-lib\fP -was built with when computing the output for the \-\-cflags and -\-\-libs options. This option is also used for the exec prefix -if \-\-exec\-prefix was not specified. This option must be specified -before any \-\-libs or \-\-cflags options. +was built with. This option is also used for the exec prefix if +\-\-exec\-prefix was not specified. + .TP 8 .B \-\-exec\-prefix=PREFIX +\-\-define\-variable=exec_prefix=PREFIX +.br If specified, use PREFIX instead of the installation exec prefix that -\fIxine-lib\fP was built with when computing the output for the \-\-cflags -and \-\-libs options. This option must be specified before any -\-\-libs or \-\-cflags options. +\fIxine-lib\fP was built with. .SH SEE ALSO .BR xine-lib (3), .BR xine (1) diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5 index 3f80ea575..dd3621575 100644 --- a/doc/man/en/xine.5 +++ b/doc/man/en/xine.5 @@ -204,7 +204,8 @@ Play entry 0 of /tmp/ntsc.nrg (Nero file). Works for some simple Nero images. .br .SS DVB .PP -DVB MRLs require that ~/.xine/channels.conf exists and contains valid data. +DVB MRLs require that xine-lib/channels.conf exists in $XDG_CONFIG_HOME/ or +~/.config/ and contains valid data. This can be obtained by generating a tuning file using the LinuxTV DVB apps utility "scan" (or "dvbscan" if you're using a version newer than 1.1.0): .PP |