diff options
| author | Måns Rullgård <mans@mansr.com> | 2009-07-12 21:13:57 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2009-07-12 21:13:57 +0000 |
| commit | 8c6d2da5be7af7b939c59ee53b22b598af07cb0e (patch) | |
| tree | 15df431286f7ff33e66cab42ad235b20f38b52c7 /configure | |
| parent | 04a803bef44e1929d3556c74c68e66b5124d7a3a (diff) | |
| download | ffmpeg-8c6d2da5be7af7b939c59ee53b22b598af07cb0e.tar.gz | |
Protect config.mak against multiple inclusion
Some of the values set here are modified by the main makefiles
and should not be reset when config.mak is included again.
Originally committed as revision 19417 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -2479,6 +2479,9 @@ echo "#define FFMPEG_CONFIG_H" >> $TMPH echo "#define FFMPEG_CONFIGURATION \"$(c_escape $FFMPEG_CONFIGURATION)\"" >> $TMPH echo "#define FFMPEG_DATADIR \"$(eval c_escape $datadir)\"" >> $TMPH +echo "ifndef FFMPEG_CONFIG_MAK" >> config.mak +echo "FFMPEG_CONFIG_MAK=1" >> config.mak + echo "FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION" >> config.mak echo "prefix=$prefix" >> config.mak echo "LIBDIR=\$(DESTDIR)$libdir" >> config.mak @@ -2609,6 +2612,7 @@ enabled asmalign_pot && echo "#define EXTERN_PREFIX \"${extern_prefix}\"" >> $TMPH echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH +echo "endif # FFMPEG_CONFIG_MAK" >> config.mak # Do not overwrite an unchanged config.h to avoid superfluous rebuilds. cmp -s $TMPH config.h && |