From 14a8acf108d24de2794229f755773c2b7459ba67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Sun, 25 Jan 2009 22:23:03 +0000 Subject: [PATCH] configure: add datadir variable and write to config.{h,mak} Originally committed as revision 16791 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/configure b/configure index f01ade671d..15f6370e20 100755 --- a/configure +++ b/configure @@ -64,6 +64,7 @@ show_help(){ echo " --disable-logging do not log configure debug information" echo " --prefix=PREFIX install in PREFIX [$prefix]" 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 " --shlibdir=DIR install shared libs in DIR [PREFIX/lib]" echo " --incdir=DIR install includes in DIR [PREFIX/include]" @@ -264,6 +265,10 @@ tolower(){ echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz } +c_escape(){ + echo "$*" | sed 's/["\\]/\\\0/g' +} + set_all(){ value=$1 shift @@ -914,6 +919,7 @@ CMDLINE_SELECT=" PATHS_LIST=' bindir + datadir incdir libdir mandir @@ -1113,6 +1119,7 @@ logfile="config.err" # installation paths prefix_default="/usr/local" bindir_default='${prefix}/bin' +datadir_default='${prefix}/share/ffmpeg' incdir_default='${prefix}/include' libdir_default='${prefix}/lib' mandir_default='${prefix}/share/man' @@ -2258,6 +2265,7 @@ echo "/* Automatically generated by configure - do not modify! */" > $TMPH echo "#ifndef FFMPEG_CONFIG_H" >> $TMPH echo "#define FFMPEG_CONFIG_H" >> $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 "prefix=$prefix" >> config.mak @@ -2265,6 +2273,7 @@ echo "LIBDIR=\$(DESTDIR)$libdir" >> config.mak echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak echo "INCDIR=\$(DESTDIR)$incdir" >> config.mak echo "BINDIR=\$(DESTDIR)$bindir" >> config.mak +echo "DATADIR=\$(DESTDIR)$datadir" >> config.mak echo "MANDIR=\$(DESTDIR)$mandir" >> config.mak echo "CC=$cc" >> config.mak echo "YASM=$yasmexe" >> config.mak