Replace PIP macro by pip

Signed-off-by: Stefan Weil <[email protected]>

Author: stweil

Makefile

@@ -5,8 +5,6 @@
 
 # Python version (python3 required).
 export PYTHON ?= python3
-# Python packaging
-export PIP ?= pip3
 # PIP_OPTIONS ?= # empty
 # Derived variable to allow filtering -e, or inserting other options
 # (the option --editable must always be last and only applies to src install)
@@ -56,10 +54,10 @@ create_venv := $(shell $(PYTHON) -m venv $(SUB_VENV)/headless-tf21 && bash -c "s
 endif
 
 # Try to install different versions of Tensorflow.
-ifneq (, $(shell bash -c "source $(SUB_VENV)/headless-tf1/bin/activate && $(PIP) install tensorflow-gpu==1.15" >/dev/null 2>&1 && echo true))
+ifneq (, $(shell bash -c "source $(SUB_VENV)/headless-tf1/bin/activate && pip install tensorflow-gpu==1.15" >/dev/null 2>&1 && echo true))
 TENSORFLOW_1 := 1
 endif
-ifneq (, $(shell bash -c "source $(SUB_VENV)/headless-tf21/bin/activate && $(PIP) install tensorflow==2.1" >/dev/null 2>&1 && echo true))
+ifneq (, $(shell bash -c "source $(SUB_VENV)/headless-tf21/bin/activate && pip install tensorflow==2.1" >/dev/null 2>&1 && echo true))
 TENSORFLOW_2_1 := 2.1
 endif
 
@@ -184,15 +182,15 @@ deinit:
 
 # Get Python modules.
 
-$(VIRTUAL_ENV)/bin/$(PIP): $(ACTIVATE_VENV)
-	. $(ACTIVATE_VENV) && $(SEMPIP) $(PIP) install --upgrade pip setuptools
+$(VIRTUAL_ENV)/bin/pip: $(ACTIVATE_VENV)
+	. $(ACTIVATE_VENV) && $(SEMPIP) pip install --upgrade pip setuptools
 
 $(ACTIVATE_VENV) $(VIRTUAL_ENV):
 	$(SEMPIP) $(PYTHON) -m venv $(VIRTUAL_ENV)
 
 # avoid making this .PHONY so it does not have to be repeated
 $(SHARE)/numpy: | $(ACTIVATE_VENV) $(SHARE)
-	. $(ACTIVATE_VENV) && $(SEMPIP) $(PIP) install $(PIP_OPTIONS_E) numpy
+	. $(ACTIVATE_VENV) && $(SEMPIP) pip install $(PIP_OPTIONS_E) numpy
 	@touch $@
 
 # Install modules from source.
@@ -201,7 +199,7 @@ $(SHARE)/numpy: | $(ACTIVATE_VENV) $(SHARE)
 ocrd: $(BIN)/ocrd
 deps-ubuntu-modules: core
 $(BIN)/ocrd: core
-	. $(ACTIVATE_VENV) && $(MAKE) -C $< install PIP_INSTALL="$(SEMPIP) $(PIP) install $(PIP_OPTIONS)" && touch -c $@
+	. $(ACTIVATE_VENV) && $(MAKE) -C $< install PIP_INSTALL="$(SEMPIP) pip install $(PIP_OPTIONS)" && touch -c $@
 
 # Convert the executable names (1) to a pattern rule,
 # so that the recipe will be used with single-recipe-
@@ -214,7 +212,7 @@ OCRD_EXECUTABLES += $(PAGE2IMG)
 PAGE2IMG := $(BIN)/page2img
 format-converters/page2img.py: format-converters
 $(PAGE2IMG): format-converters/page2img.py
-	. $(ACTIVATE_VENV) && $(SEMPIP) $(PIP) install validators
+	. $(ACTIVATE_VENV) && $(SEMPIP) pip install validators
 	echo "#!$(BIN)/python3" | cat - $< >$@
 	chmod +x $@
 endif
@@ -227,7 +225,7 @@ opencv-python: GIT_RECURSIVE = --recursive
 opencv-python/setup.py: opencv-python
 $(SHARE)/opencv-python: opencv-python/setup.py | $(ACTIVATE_VENV) $(SHARE) $(SHARE)/numpy
 	. $(ACTIVATE_VENV) && cd opencv-python && ENABLE_HEADLESS=1 $(PYTHON) setup.py bdist_wheel
-	. $(ACTIVATE_VENV) && $(SEMPIP) $(PIP) install $(<D)/dist/opencv_python_headless-*.whl
+	. $(ACTIVATE_VENV) && $(SEMPIP) pip install $(<D)/dist/opencv_python_headless-*.whl
 	@touch $@
 $(BIN)/ocrd: $(SHARE)/opencv-python
 endif
@@ -282,7 +280,7 @@ OCRD_EXECUTABLES += $(OCRD_DETECTRON2)
 OCRD_DETECTRON2 := $(BIN)/ocrd-detectron2-segment
 $(OCRD_DETECTRON2): ocrd_detectron2
 	# . $(ACTIVATE_VENV) && $(MAKE) -C $< deps
-	. $(ACTIVATE_VENV) && cd $< && $(PIP) install 'git+https://github.com/facebookresearch/detectron2.git' && $(PIP) install -r requirements.txt
+	. $(ACTIVATE_VENV) && cd $< && pip install 'git+https://github.com/facebookresearch/detectron2.git' && pip install -r requirements.txt
 	$(pip_install)
 endif
 
@@ -621,11 +619,11 @@ endif
 # the binary itself updates):
 ifeq ($(findstring headless-tf1, $(VIRTUAL_ENV)),)
 define pip_install
-. $(ACTIVATE_VENV) && cd $< && $(SEMPIP) $(PIP) install $(PIP_OPTIONS_E) . && touch -c $@
+. $(ACTIVATE_VENV) && cd $< && $(SEMPIP) pip install $(PIP_OPTIONS_E) . && touch -c $@
 endef
 else
 define pip_install
-. $(ACTIVATE_VENV) && cd $< && $(SEMPIP) $(PIP) install -c $(CURDIR)/constraints_tf1.txt $(PIP_OPTIONS_E) . && touch -c $@
+. $(ACTIVATE_VENV) && cd $< && $(SEMPIP) pip install -c $(CURDIR)/constraints_tf1.txt $(PIP_OPTIONS_E) . && touch -c $@
 endef
 endif
 
@@ -680,14 +678,14 @@ endif
 # avoid making these .PHONY so they do not have to be repeated:
 # tesserocr
 $(SHARE)/%: % | $(ACTIVATE_VENV) $(SHARE)
-	. $(ACTIVATE_VENV) && cd $< && $(SEMPIP) $(PIP) install $(PIP_OPTIONS) .
+	. $(ACTIVATE_VENV) && cd $< && $(SEMPIP) pip install $(PIP_OPTIONS) .
 	@touch $@
 
 $(SHARE):
 	@mkdir -p "$@"
 
 # At last, add venv dependency (must not become first):
-$(OCRD_EXECUTABLES): | $(VIRTUAL_ENV)/bin/$(PIP)
+$(OCRD_EXECUTABLES): | $(VIRTUAL_ENV)/bin/pip
 $(OCRD_EXECUTABLES):
 # Also, add core dependency (but in a non-circular way):
 $(filter-out $(BIN)/ocrd,$(OCRD_EXECUTABLES)): $(BIN)/ocrd
@@ -700,7 +698,7 @@ show:
 	@echo OCRD_EXECUTABLES = $(OCRD_EXECUTABLES:$(BIN)/%=%)
 
 check: $(OCRD_EXECUTABLES:%=%-check) $(OCRD_MODULES:%=%-check)
-	. $(ACTIVATE_VENV) && $(PIP) check
+	. $(ACTIVATE_VENV) && pip check
 %-check: ;
 
 .PHONY: $(OCRD_EXECUTABLES:%=%-check)