diff options
| author | Philippe Crama <pcfeb0009@gmx.com> | 2011-01-03 21:44:01 +0100 |
|---|---|---|
| committer | Philippe Crama <pcfeb0009@gmx.com> | 2011-01-03 21:44:01 +0100 |
| commit | 51f0c2b8756c63774c507f000dc06d5d56f4cbf7 (patch) | |
| tree | c7f05be8bb8d35fc41b3bdf1f98b0dcdf71ed006 | |
| parent | 0e886477725bf6f55c8556e313716131d0adc2e8 (diff) | |
First try absolute path, then look for basename in PATH
| -rw-r--r-- | skype/t/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/skype/t/Makefile b/skype/t/Makefile index c58729dc..be960f24 100644 --- a/skype/t/Makefile +++ b/skype/t/Makefile @@ -14,7 +14,13 @@ default: $(tests) $(tests): % : %.test @echo "--- Running test $@ ---"; \ - if ! ./livetest-bitlbee.sh $(BITLBEE) $(PORT) irssi/livetest-irssi.sh $< >$@.log; then \ + if [ -r "$(BITLBEE)" -a -x "$(BITLBEE)" ]; then \ + bitlbee_binary="$(BITLBEE)"; \ + else \ + bitlbee_basename=`basename $(BITLBEE)`; \ + bitlbee_binary=`which $$bitlbee_basename`; \ + fi; \ + if ! ./livetest-bitlbee.sh "$$bitlbee_binary" $(PORT) irssi/livetest-irssi.sh $< >$@.log; then \ echo Test failed, log: ;\ cat $@.log;\ exit 1;\ |