Merge pull request universal-ctags#255 from ntrel/fix-msys1-units

Use `timeout --version` to check for GNU timeout
kleopatra999 · Feb 26, 2015 · d8c5a01 · d8c5a01
2 parents be5628f + 2c7080b
commit d8c5a01
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -367,7 +367,7 @@ check: units
 #
 # SHELL must be dash or bash.
 #
-fuzz: TIMEOUT := $(shell which timeout > /dev/null 2>&1 && echo 1 || echo 0)
+fuzz: TIMEOUT := $(shell timeout --version > /dev/null 2>&1 && echo 1 || echo 0)
 fuzz: $(CTAGS_TEST)
 	@ \
 	c="misc/units fuzz \
@@ -392,7 +392,7 @@ noise: $(CTAGS_TEST)
 #
 # UNITS Target
 #
-units: TIMEOUT := $(shell which timeout > /dev/null 2>&1 && echo 5 || echo 0)
+units: TIMEOUT := $(shell timeout --version > /dev/null 2>&1 && echo 5 || echo 0)
 units: $(CTAGS_TEST)
 	@ \
 	c="misc/units run \