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

python-cli.mk, topdir.mk: Python2 -> $(PYTHON)

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-07-06 14:39:33 +00:00
commit 31d11febd8
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/python-cli.mk
View file

@ -9,7 +9,7 @@ clean:
distclean:
run:
python2 -m $(shell echo $(patsubst %.py,%,$(EXE)) | sed 's%^\./%%; s%/%.%g') $(EXE_ARGS)
$(PYTHON) -m $(shell echo $(patsubst %.py,%,$(EXE)) | sed 's%^\./%%; s%/%.%g') $(EXE_ARGS)
pyc.clean:
find . -name '*.pyc' -print0 | xargs -r -0 $(RM) -f

6
make/topdir.mk
View file

@ -161,7 +161,7 @@ git-update-project-description:
ssh git.janware.com "/opt/jw-build/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) update-descriptions $(PROJECT)"
projects-%:
python2 $(JWB_SCRIPT_DIR)/projects.py build $* $(PROJECT)
$(PYTHON) $(JWB_SCRIPT_DIR)/projects.py build $* $(PROJECT)
install-deps-devel:
sudo zypper in $(shell echo $(RPM_REQUIRES_DEVEL) | sed "s/ *= */-/g; s/ [^ ]\+-__NEXT_VERSION__//")
@ -195,3 +195,7 @@ git-ssh: git-ssh-origin
echo-hash:
@/bin/bash $(PKG_SH_EXE) hash
recache-vars:
rm -f $(TOPDIR)/make/.cache.mk
make -C $(TOPDIR)/make .cache.mk