From: klueska Date: Wed, 26 Mar 2008 22:51:33 +0000 (+0000) Subject: Wasn't working with cygwin after last "fix" X-Git-Tag: release_tinyos_2_1_0_0~480 X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=681199f1eee24b52ddd0142782925bffc39b6936 Wasn't working with cygwin after last "fix" --- diff --git a/support/make/msp/bsl.extra b/support/make/msp/bsl.extra index 07db9ced..d5c0f54e 100644 --- a/support/make/msp/bsl.extra +++ b/support/make/msp/bsl.extra @@ -20,9 +20,9 @@ BSL ?= auto MSP_BSL_FLAGS ?= --telos ifeq ($(BSL),auto) -BSLTEST = $(shell motelist -c | perl -e '<> =~ /^[^,]+,(\S+),/; print $$1;' ) +BSLTEST = $(shell motelist -c | perl -e '<> =~ /^[^,]+,(\S+?(\d+)[^,]*)/; print $$1;' ) BSLTEST_COMMENT = "using bsl,auto" -BSL = $(shell motelist -c | perl -e '<> =~ /^[^,]+,(\S+),/; ($$s,$$n)=($$1,$$2); if($$s=~/^com/i) { print $$n-1 } else { print $$s; };' ) +BSL = $(shell motelist -c | perl -e '<> =~ /^[^,]+,(\S+?(\d+)[^,]*)/; ($$s,$$n)=($$1,$$2); if($$s=~/^com/i) { print $$n-1 } else { print $$s; };' ) BSL_TARGETS += bsltest else ifeq ($(BSL:ref,%=ref),ref)