mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Revert "build: Remove multiple inclusion guards from config.mak."
This reverts commit 89b5829d0a
.
Conflicts:
configure
This commit is contained in:
parent
1109680434
commit
ebc64dc818
3
configure
vendored
3
configure
vendored
@ -3319,6 +3319,8 @@ config_files="$TMPH config.mak"
|
||||
|
||||
cat > config.mak <<EOF
|
||||
# Automatically generated by configure - do not modify!
|
||||
ifndef FFMPEG_CONFIG_MAK
|
||||
FFMPEG_CONFIG_MAK=1
|
||||
FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION
|
||||
prefix=$prefix
|
||||
LIBDIR=\$(DESTDIR)$libdir
|
||||
@ -3461,6 +3463,7 @@ SEEK_TESTS=$(print_enabled -n _test $SEEK_TESTS)
|
||||
EOF
|
||||
|
||||
echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
|
||||
echo "endif # FFMPEG_CONFIG_MAK" >> config.mak
|
||||
|
||||
# Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
|
||||
cp_if_changed $TMPH config.h
|
||||
|
Loading…
Reference in New Issue
Block a user