Commit 060d845d authored by Mike Hibler's avatar Mike Hibler

Have configure get rid of old third-party distros in source tree.

This isn't just Mike being anal, the presence of the tg2.0 distro actually
breaks the build.

Also take tg2.0 out of .gitignore.
parent 8aa964de
event/trafgen/tg2.0
.merge-build
......@@ -7203,6 +7203,20 @@ if test "$TBMAINSITE" = 1; then
FANCYBANNER=1
fi
#
# Get rid of old third-party distributions in the source tree since we now
# unpack them in the build tree. In the case of tg2.0, it actually breaks
# the build if the old tree exists.
#
echo -n "Checking for errant distributions in src dir ... ";
for baddir in trafgen/tg2.0 linktest/iperf/iperf-2.0.2 linktest/rude/rude-0.70; do
if test -e "$srcdir/event/$baddir" -o -e "$srcdir/clientside/event/$baddir"; then
rm -rf $srcdir/event/$baddir $srcdir/clientside/event/$baddir
echo -n "$baddir "
fi
done
echo "done"
#
# Check for protogeni rspec.
#
......
......@@ -903,6 +903,20 @@ if test "$TBMAINSITE" = 1; then
FANCYBANNER=1
fi
#
# Get rid of old third-party distributions in the source tree since we now
# unpack them in the build tree. In the case of tg2.0, it actually breaks
# the build if the old tree exists.
#
echo -n "Checking for errant distributions in src dir ... ";
for baddir in trafgen/tg2.0 linktest/iperf/iperf-2.0.2 linktest/rude/rude-0.70; do
if test -e "$srcdir/event/$baddir" -o -e "$srcdir/clientside/event/$baddir"; then
rm -rf $srcdir/event/$baddir $srcdir/clientside/event/$baddir
echo -n "$baddir "
fi
done
echo "done"
#
# Check for protogeni rspec.
#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment