From b5997c41da3a6ff38526bc9899fad3f0c048ef07 Mon Sep 17 00:00:00 2001 From: Lucas Sulzbach Date: Mon, 18 May 2020 15:42:01 -0300 Subject: [PATCH 1/3] Makefile: Add deps-ubuntu target --- Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8ebc2d1..fdebaed 100644 --- a/Makefile +++ b/Makefile @@ -16,10 +16,11 @@ help: @echo "" @echo " Targets" @echo "" - @echo " deps Install python packages" - @echo " install Install the executable in $(PREFIX)/bin and the ocrd-tool.json to $(SHAREDIR)" - @echo " uninstall Uninstall scripts and $(SHAREDIR)" - @echo " docker Build Docker image" + @echo " deps-ubuntu Install system packages (on Debian/Ubuntu)" + @echo " deps Install python packages" + @echo " install Install the executable in $(PREFIX)/bin and the ocrd-tool.json to $(SHAREDIR)" + @echo " uninstall Uninstall scripts and $(SHAREDIR)" + @echo " docker Build Docker image" @echo "" @echo " Variables" @echo "" @@ -27,6 +28,10 @@ help: # END-EVAL +# Install system packages (on Debian/Ubuntu) +deps-ubuntu: + apt-get install -y make python3 python3-pip python3-venv openjdk-8-jdk + # Install python packages deps: $(PIP) install ocrd # needed for ocrd CLI (and bashlib) From b398170de653408d812c03340d7f38a4579500da Mon Sep 17 00:00:00 2001 From: Lucas Sulzbach <33208157+sulzbals@users.noreply.github.com> Date: Mon, 18 May 2020 17:10:12 -0300 Subject: [PATCH 2/3] Makefile: Update target deps-ubuntu Co-authored-by: Robert Sachunsky <38561704+bertsky@users.noreply.github.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fdebaed..136a242 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ help: # Install system packages (on Debian/Ubuntu) deps-ubuntu: - apt-get install -y make python3 python3-pip python3-venv openjdk-8-jdk + apt-get install -y make python3 python3-pip python3-venv openjdk-8-jre-headless ghostscript # Install python packages deps: From 0a27ae49729d43f623c6c980804d9c928f2667e0 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Fri, 22 May 2020 14:35:55 +0200 Subject: [PATCH 3/3] Update Makefile Remove the unneeded packages `make` (already required earlier) and `python3-pip` (not needed when using venv). --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 136a242..82d94f1 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ help: # Install system packages (on Debian/Ubuntu) deps-ubuntu: - apt-get install -y make python3 python3-pip python3-venv openjdk-8-jre-headless ghostscript + apt-get install -y python3 python3-venv openjdk-8-jre-headless ghostscript # Install python packages deps: