Commit 09b1ba5d authored by Mike Hibler's avatar Mike Hibler

Fix another cause of trafgen not building.

This might have been fixed in later gmakes, but at least for the circa-FBSD6
version, the shell PWD variable is not correctly set when a shell script is
run from a make target via:
    $(MAKE) -C foo target
instead of:
    cd foo && $(MAKE) target
In the former case, $PWD would not reflect that it was in "foo".
The upshot is that the tg2.0 tarball was being extracted in the "event"
directory rather than "event/trafgen" so the make rules could not find it.
The same basic shell script worked for iperf and rude because they were
invoked via the latter form.

Anyway, now we just use dir=`pwd` instead of dir=$PWD.
parent f1601281
......@@ -21,7 +21,7 @@ fi
if [ -n "$1" ]; then srcdir=$1; else srcdir=$PWD ; fi
if [ -n "$2" ]; then tarball=$2; fi
if [ -n "$3" ]; then host=$3; else host=www.emulab.net ; fi
dir=$PWD
dir=`pwd`
if [ ! -d $dir/iperf-$version/src ]; then
if [ ! -f "$tarball" ]; then
......
......@@ -21,7 +21,7 @@ fi
if [ -n "$1" ]; then srcdir=$1; else srcdir=$PWD ; fi
if [ -n "$2" ]; then tarball=$2; fi
if [ -n "$3" ]; then host=$3; else host=www.emulab.net ; fi
dir=$PWD
dir=`pwd`
if [ ! -d $dir/rude-$version/src ]; then
if [ ! -f "$tarball" ]; then
......
......@@ -21,7 +21,7 @@ fi
if [ -n "$1" ]; then srcdir=$1; else srcdir=$PWD ; fi
if [ -n "$2" ]; then tarball=$2; fi
if [ -n "$3" ]; then host=$3; else host=www.emulab.net ; fi
dir=$PWD
dir=`pwd`
if [ ! -d $dir/tg${version}/src ]; then
if [ ! -f "$tarball" ]; then
......
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