mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
build: avoid corrupted gnulib/tests/Makefile
Running 'make check' can sometimes fail in the gnulib/tests subdirectory, when doing an incremental build, because ./bootstrap generates a Makefile.am that tries to refer to ../../.. instead of ../.., and gets lost. This may be an upstream gnulib bug, where a more elegant solution will present itself in the future: http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/24898 But in the meantime, I was able to reproduce both the issue, and this solution to work around it. * bootstrap.conf (bootstrap_epilogue): Ensure that no stray ../../.. components remain in gnulib/tests/Makefile.in. Reported by Serge Hallyn.
This commit is contained in:
parent
6cabc0b0d0
commit
6cbab7c159
@ -168,8 +168,10 @@ touch ChangeLog || exit 1
|
|||||||
|
|
||||||
bootstrap_epilogue()
|
bootstrap_epilogue()
|
||||||
{
|
{
|
||||||
# Change paths in gnulib/tests/Makefile.am from "../../.." to "../..".
|
# Change paths in gnulib/tests/Makefile.am from "../../.." to "../..",
|
||||||
|
# then ensure that gnulib/tests/Makefile.in is up-to-date.
|
||||||
m=gnulib/tests/Makefile.am
|
m=gnulib/tests/Makefile.am
|
||||||
sed 's,\.\./\.\./\.\.,../..,g' $m > $m-t
|
sed 's,\.\./\.\./\.\.,../..,g' $m > $m-t
|
||||||
mv -f $m-t $m
|
mv -f $m-t $m
|
||||||
|
${AUTOMAKE-automake} gnulib/tests/Makefile
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user