Originally committed as revision 16791 to svn://svn.ffmpeg.org/ffmpeg/trunk
Måns Rullgård authored on 2009/01/26 07:23:03... | ... |
@@ -64,6 +64,7 @@ show_help(){ |
64 | 64 |
echo " --disable-logging do not log configure debug information" |
65 | 65 |
echo " --prefix=PREFIX install in PREFIX [$prefix]" |
66 | 66 |
echo " --bindir=DIR install binaries in DIR [PREFIX/bin]" |
67 |
+ echo " --datadir=DIR install data files in DIR [PREFIX/share/ffmpeg]" |
|
67 | 68 |
echo " --libdir=DIR install libs in DIR [PREFIX/lib]" |
68 | 69 |
echo " --shlibdir=DIR install shared libs in DIR [PREFIX/lib]" |
69 | 70 |
echo " --incdir=DIR install includes in DIR [PREFIX/include]" |
... | ... |
@@ -264,6 +265,10 @@ tolower(){ |
264 | 264 |
echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz |
265 | 265 |
} |
266 | 266 |
|
267 |
+c_escape(){ |
|
268 |
+ echo "$*" | sed 's/["\\]/\\\0/g' |
|
269 |
+} |
|
270 |
+ |
|
267 | 271 |
set_all(){ |
268 | 272 |
value=$1 |
269 | 273 |
shift |
... | ... |
@@ -914,6 +919,7 @@ CMDLINE_SELECT=" |
914 | 914 |
|
915 | 915 |
PATHS_LIST=' |
916 | 916 |
bindir |
917 |
+ datadir |
|
917 | 918 |
incdir |
918 | 919 |
libdir |
919 | 920 |
mandir |
... | ... |
@@ -1113,6 +1119,7 @@ logfile="config.err" |
1113 | 1113 |
# installation paths |
1114 | 1114 |
prefix_default="/usr/local" |
1115 | 1115 |
bindir_default='${prefix}/bin' |
1116 |
+datadir_default='${prefix}/share/ffmpeg' |
|
1116 | 1117 |
incdir_default='${prefix}/include' |
1117 | 1118 |
libdir_default='${prefix}/lib' |
1118 | 1119 |
mandir_default='${prefix}/share/man' |
... | ... |
@@ -2258,6 +2265,7 @@ echo "/* Automatically generated by configure - do not modify! */" > $TMPH |
2258 | 2258 |
echo "#ifndef FFMPEG_CONFIG_H" >> $TMPH |
2259 | 2259 |
echo "#define FFMPEG_CONFIG_H" >> $TMPH |
2260 | 2260 |
echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH |
2261 |
+echo "#define FFMPEG_DATADIR \"$(eval c_escape $datadir)\"" >> $TMPH |
|
2261 | 2262 |
|
2262 | 2263 |
echo "FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION" >> config.mak |
2263 | 2264 |
echo "prefix=$prefix" >> config.mak |
... | ... |
@@ -2265,6 +2273,7 @@ echo "LIBDIR=\$(DESTDIR)$libdir" >> config.mak |
2265 | 2265 |
echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak |
2266 | 2266 |
echo "INCDIR=\$(DESTDIR)$incdir" >> config.mak |
2267 | 2267 |
echo "BINDIR=\$(DESTDIR)$bindir" >> config.mak |
2268 |
+echo "DATADIR=\$(DESTDIR)$datadir" >> config.mak |
|
2268 | 2269 |
echo "MANDIR=\$(DESTDIR)$mandir" >> config.mak |
2269 | 2270 |
echo "CC=$cc" >> config.mak |
2270 | 2271 |
echo "YASM=$yasmexe" >> config.mak |