Commit 01cc5074 authored by mru's avatar mru

configure: add datadir variable and write to config.{h,mak}

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@16791 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 76044473
...@@ -64,6 +64,7 @@ show_help(){ ...@@ -64,6 +64,7 @@ show_help(){
echo " --disable-logging do not log configure debug information" echo " --disable-logging do not log configure debug information"
echo " --prefix=PREFIX install in PREFIX [$prefix]" echo " --prefix=PREFIX install in PREFIX [$prefix]"
echo " --bindir=DIR install binaries in DIR [PREFIX/bin]" echo " --bindir=DIR install binaries in DIR [PREFIX/bin]"
echo " --datadir=DIR install data files in DIR [PREFIX/share/ffmpeg]"
echo " --libdir=DIR install libs in DIR [PREFIX/lib]" echo " --libdir=DIR install libs in DIR [PREFIX/lib]"
echo " --shlibdir=DIR install shared libs in DIR [PREFIX/lib]" echo " --shlibdir=DIR install shared libs in DIR [PREFIX/lib]"
echo " --incdir=DIR install includes in DIR [PREFIX/include]" echo " --incdir=DIR install includes in DIR [PREFIX/include]"
...@@ -264,6 +265,10 @@ tolower(){ ...@@ -264,6 +265,10 @@ tolower(){
echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
} }
c_escape(){
echo "$*" | sed 's/["\\]/\\\0/g'
}
set_all(){ set_all(){
value=$1 value=$1
shift shift
...@@ -914,6 +919,7 @@ CMDLINE_SELECT=" ...@@ -914,6 +919,7 @@ CMDLINE_SELECT="
PATHS_LIST=' PATHS_LIST='
bindir bindir
datadir
incdir incdir
libdir libdir
mandir mandir
...@@ -1113,6 +1119,7 @@ logfile="config.err" ...@@ -1113,6 +1119,7 @@ logfile="config.err"
# installation paths # installation paths
prefix_default="/usr/local" prefix_default="/usr/local"
bindir_default='${prefix}/bin' bindir_default='${prefix}/bin'
datadir_default='${prefix}/share/ffmpeg'
incdir_default='${prefix}/include' incdir_default='${prefix}/include'
libdir_default='${prefix}/lib' libdir_default='${prefix}/lib'
mandir_default='${prefix}/share/man' mandir_default='${prefix}/share/man'
...@@ -2258,6 +2265,7 @@ echo "/* Automatically generated by configure - do not modify! */" > $TMPH ...@@ -2258,6 +2265,7 @@ echo "/* Automatically generated by configure - do not modify! */" > $TMPH
echo "#ifndef FFMPEG_CONFIG_H" >> $TMPH echo "#ifndef FFMPEG_CONFIG_H" >> $TMPH
echo "#define FFMPEG_CONFIG_H" >> $TMPH echo "#define FFMPEG_CONFIG_H" >> $TMPH
echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH
echo "#define FFMPEG_DATADIR \"$(eval c_escape $datadir)\"" >> $TMPH
echo "FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION" >> config.mak echo "FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION" >> config.mak
echo "prefix=$prefix" >> config.mak echo "prefix=$prefix" >> config.mak
...@@ -2265,6 +2273,7 @@ echo "LIBDIR=\$(DESTDIR)$libdir" >> config.mak ...@@ -2265,6 +2273,7 @@ echo "LIBDIR=\$(DESTDIR)$libdir" >> config.mak
echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak
echo "INCDIR=\$(DESTDIR)$incdir" >> config.mak echo "INCDIR=\$(DESTDIR)$incdir" >> config.mak
echo "BINDIR=\$(DESTDIR)$bindir" >> config.mak echo "BINDIR=\$(DESTDIR)$bindir" >> config.mak
echo "DATADIR=\$(DESTDIR)$datadir" >> config.mak
echo "MANDIR=\$(DESTDIR)$mandir" >> config.mak echo "MANDIR=\$(DESTDIR)$mandir" >> config.mak
echo "CC=$cc" >> config.mak echo "CC=$cc" >> config.mak
echo "YASM=$yasmexe" >> config.mak echo "YASM=$yasmexe" >> config.mak
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment