Merge branch 'meaningcloud' into 'master'

Meaningcloud See merge request docs/templates/makefiles!8
7 years ago · a75ba6994d
parent 24d85b18bb 919c4a07a2
commit a75ba6994d
2 changed files with 2 additions and 2 deletions
--- a/base.mk
+++ b/base.mk
@ -2,7 +2,7 @@ export
 NAME ?= $(shell basename $(CURDIR))
 VERSION ?= $(shell git describe --tags --dirty 2>/dev/null)

-ifeq ($(wildcard $VERSION),)
+ifeq ($(VERSION),)
 	VERSION:=unknown
 endif

--- a/python.mk
+++ b/python.mk
@ -1,4 +1,4 @@
-PYVERSIONS ?= 2.7
+PYVERSIONS ?= 3.5
 PYMAIN ?= $(firstword $(PYVERSIONS))
 TARNAME ?= $(NAME)-$(VERSION).tar.gz 
 VERSIONFILE ?= $(NAME)/VERSION