summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile10
-rwxr-xr-xconfigure9
2 files changed, 18 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 35155bcfbb..1e12d33345 100644
--- a/Makefile
+++ b/Makefile
@@ -111,12 +111,20 @@ ffplay.o: ffplay.c
videohook: .libs
$(MAKE) -C vhook all
-install: all $(INSTALLVHOOK)
+install: all install-man $(INSTALLVHOOK)
$(MAKE) -C libavcodec install
$(MAKE) -C libavformat install
install -d $(prefix)/bin
install -c -s -m 755 $(PROG) $(prefix)/bin
+# install man from source dir if available
+install-man:
+ if [ -f $(SRC_PATH)/doc/ffmpeg.1 ] ; then \
+ install -d $(mandir)/man1 ; \
+ install -m 644 $(SRC_PATH)/doc/ffmpeg.1 $(SRC_PATH)/doc/ffplay.1 \
+ $(SRC_PATH)/doc/ffserver.1 $(mandir)/man1 ; \
+ fi
+
install-vhook: $(prefix)/lib/vhook
$(MAKE) -C vhook install INSTDIR=$(prefix)/lib/vhook
diff --git a/configure b/configure
index fe98b91485..61218b2b1f 100755
--- a/configure
+++ b/configure
@@ -19,6 +19,7 @@ TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
# default parameters
prefix="/usr/local"
+mandir=""
cross_prefix=""
cc="gcc"
ar="ar"
@@ -264,6 +265,8 @@ for opt do
case "$opt" in
--prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
;;
+ --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
+ ;;
--source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
;;
--cross-prefix=*) cross_prefix=`echo $opt | cut -d '=' -f 2`
@@ -722,6 +725,10 @@ if test "$small" = "yes"; then
CFLAGS="$CFLAGS -Os"
fi
+if test x"$mandir" = x""; then
+mandir="${prefix}/man"
+fi
+
if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
cat << EOF
@@ -732,6 +739,7 @@ EOF
echo "Standard options:"
echo " --help print this message"
echo " --prefix=PREFIX install in PREFIX [$prefix]"
+echo " --mandir=DIR man documentation in DIR [PREFIX/man]"
echo " --enable-mp3lame enable mp3 encoding via libmp3lame [default=no]"
echo " --enable-vorbis enable vorbis support via libvorbisenc [default=no]"
echo " --enable-faad enable faad support via libfaad [default=no]"
@@ -827,6 +835,7 @@ echo "# Automatically generated by configure - do not modify" > config.mak
echo "/* Automatically generated by configure - do not modify */" > $TMPH
echo "prefix=$prefix" >> config.mak
+echo "mandir=$mandir" >> config.mak
echo "MAKE=$make" >> config.mak
echo "CC=$cc" >> config.mak
echo "AR=$ar" >> config.mak