Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
23a65308
Commit
23a65308
authored
21 years ago
by
Fabrice Bellard
Browse files
Options
Downloads
Patches
Plain Diff
man page installation support
Originally committed as revision 2145 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
f5fe9d5f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+9
-1
9 additions, 1 deletion
Makefile
configure
+9
-0
9 additions, 0 deletions
configure
with
18 additions
and
1 deletion
Makefile
+
9
−
1
View file @
23a65308
...
@@ -111,12 +111,20 @@ ffplay.o: ffplay.c
...
@@ -111,12 +111,20 @@ ffplay.o: ffplay.c
videohook
:
.libs
videohook
:
.libs
$(
MAKE
)
-C
vhook all
$(
MAKE
)
-C
vhook all
install
:
all $(INSTALLVHOOK)
install
:
all
install-man
$(INSTALLVHOOK)
$(
MAKE
)
-C
libavcodec
install
$(
MAKE
)
-C
libavcodec
install
$(
MAKE
)
-C
libavformat
install
$(
MAKE
)
-C
libavformat
install
install
-d
$(
prefix
)
/bin
install
-d
$(
prefix
)
/bin
install
-c
-s
-m
755
$(
PROG
)
$(
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
install-vhook
:
$(prefix)/lib/vhook
$(
MAKE
)
-C
vhook
install
INSTDIR
=
$(
prefix
)
/lib/vhook
$(
MAKE
)
-C
vhook
install
INSTDIR
=
$(
prefix
)
/lib/vhook
...
...
This diff is collapsed.
Click to expand it.
configure
+
9
−
0
View file @
23a65308
...
@@ -19,6 +19,7 @@ TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
...
@@ -19,6 +19,7 @@ TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
# default parameters
# default parameters
prefix
=
"/usr/local"
prefix
=
"/usr/local"
mandir
=
""
cross_prefix
=
""
cross_prefix
=
""
cc
=
"gcc"
cc
=
"gcc"
ar
=
"ar"
ar
=
"ar"
...
@@ -264,6 +265,8 @@ for opt do
...
@@ -264,6 +265,8 @@ for opt do
case
"
$opt
"
in
case
"
$opt
"
in
--prefix
=
*
)
prefix
=
`
echo
$opt
|
cut
-d
'='
-f
2
`
--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
`
--source-path
=
*
)
source_path
=
`
echo
$opt
|
cut
-d
'='
-f
2
`
;;
;;
--cross-prefix
=
*
)
cross_prefix
=
`
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
...
@@ -722,6 +725,10 @@ if test "$small" = "yes"; then
CFLAGS
=
"
$CFLAGS
-Os"
CFLAGS
=
"
$CFLAGS
-Os"
fi
fi
if
test
x
"
$mandir
"
=
x
""
;
then
mandir
=
"
${
prefix
}
/man"
fi
if
test
x
"
$1
"
=
x
"-h"
-o
x
"
$1
"
=
x
"--help"
;
then
if
test
x
"
$1
"
=
x
"-h"
-o
x
"
$1
"
=
x
"--help"
;
then
cat
<<
EOF
cat
<<
EOF
...
@@ -732,6 +739,7 @@ EOF
...
@@ -732,6 +739,7 @@ EOF
echo
"Standard options:"
echo
"Standard options:"
echo
" --help print this message"
echo
" --help print this message"
echo
" --prefix=PREFIX install in PREFIX [
$prefix
]"
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-mp3lame enable mp3 encoding via libmp3lame [default=no]"
echo
" --enable-vorbis enable vorbis support via libvorbisenc [default=no]"
echo
" --enable-vorbis enable vorbis support via libvorbisenc [default=no]"
echo
" --enable-faad enable faad support via libfaad [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
...
@@ -827,6 +835,7 @@ echo "# Automatically generated by configure - do not modify" > config.mak
echo
"/* Automatically generated by configure - do not modify */"
>
$TMPH
echo
"/* Automatically generated by configure - do not modify */"
>
$TMPH
echo
"prefix=
$prefix
"
>>
config.mak
echo
"prefix=
$prefix
"
>>
config.mak
echo
"mandir=
$mandir
"
>>
config.mak
echo
"MAKE=
$make
"
>>
config.mak
echo
"MAKE=
$make
"
>>
config.mak
echo
"CC=
$cc
"
>>
config.mak
echo
"CC=
$cc
"
>>
config.mak
echo
"AR=
$ar
"
>>
config.mak
echo
"AR=
$ar
"
>>
config.mak
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment