janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

py-defs.mk, projects.mk: Fix /usr/bin/python globbing on OpenSUSE

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2020-05-18 13:15:35 +00:00
commit f3febfa460
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/projects.mk
View file

@ -31,7 +31,7 @@ ifneq ($(PYTHON_VERSION),)
PYTHON := /usr/bin/python$(PYTHON_VERSION) PYTHON := /usr/bin/python$(PYTHON_VERSION)
else else
ifeq ($(PYTHON),) ifeq ($(PYTHON),)
PYTHON := $(lastword $(shell ls -v /usr/bin/python[0-9]*)) PYTHON := $(lastword $(shell ls -v /usr/bin/python[0-9].[0-9]))
endif endif
PYTHON_VERSION ?= $(patsubst python%,%,$(notdir $(PYTHON))) PYTHON_VERSION ?= $(patsubst python%,%,$(notdir $(PYTHON)))
endif endif

2
make/py-defs.mk
View file

@ -4,7 +4,7 @@ ifneq ($(PYTHON_VERSION),)
PYTHON := /usr/bin/python$(PYTHON_VERSION) PYTHON := /usr/bin/python$(PYTHON_VERSION)
else else
ifeq ($(PYTHON),) ifeq ($(PYTHON),)
PYTHON := $(lastword $(shell ls -v /usr/bin/python[0-9]*)) PYTHON := $(lastword $(shell ls -v /usr/bin/python[0-9].[0-9]))
endif endif
PYTHON_VERSION ?= $(patsubst python%,%,$(notdir $(PYTHON))) PYTHON_VERSION ?= $(patsubst python%,%,$(notdir $(PYTHON)))
endif endif