diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-01 13:41:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-01 13:42:37 +0200 |
| commit | d8809b357c5ee3a760262b17bc7f97ecb876cb96 (patch) | |
| tree | 7c2a0fb918f6d1cf1a971597600d90c585ff1996 /configure | |
| parent | 67d7ea9825f6c3dfae5323c5252dbc602acddd1d (diff) | |
| parent | f4ca970dba13a60a1334cce1b574036e6f624b9c (diff) | |
| download | ffmpeg-d8809b357c5ee3a760262b17bc7f97ecb876cb96.tar.gz | |
Merge commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c'
* commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c':
configure: Add docdir configuration option
Conflicts:
configure
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -82,6 +82,7 @@ Standard options: --prefix=PREFIX install in PREFIX [$prefix] --bindir=DIR install binaries in DIR [PREFIX/bin] --datadir=DIR install data files in DIR [PREFIX/share/ffmpeg] + --docdir=DIR install documentation in DIR [PREFIX/share/doc/ffmpeg] --libdir=DIR install libs in DIR [PREFIX/lib] --shlibdir=DIR install shared libs in DIR [PREFIX/lib] --incdir=DIR install includes in DIR [PREFIX/include] @@ -1602,6 +1603,7 @@ CMDLINE_SELECT=" PATHS_LIST=' bindir datadir + docdir incdir libdir mandir @@ -2270,6 +2272,7 @@ logfile="config.log" prefix_default="/usr/local" bindir_default='${prefix}/bin' datadir_default='${prefix}/share/ffmpeg' +docdir_default='${prefix}/share/doc/ffmpeg' incdir_default='${prefix}/include' libdir_default='${prefix}/lib' mandir_default='${prefix}/share/man' @@ -4683,6 +4686,7 @@ SHLIBDIR=\$(DESTDIR)$shlibdir INCDIR=\$(DESTDIR)$incdir BINDIR=\$(DESTDIR)$bindir DATADIR=\$(DESTDIR)$datadir +DOCDIR=\$(DESTDIR)$docdir MANDIR=\$(DESTDIR)$mandir SRC_PATH=$source_path ifndef MAIN_MAKEFILE |