From a4bd4d3370c9f6a8503a2b954d3f006c0f1aadd6 Mon Sep 17 00:00:00 2001
From: Nick White <git@njw.name>
Date: Sat, 5 Jan 2019 03:43:59 +0000
Subject: Get rid of unnecessary leptonica config and correct tesseract build
 rule

---
 roles/tesseractor/tasks/tesseract.yml    | 18 +++++-------------
 roles/tesstrainer/tasks/tesstraining.yml | 18 +++++-------------
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/roles/tesseractor/tasks/tesseract.yml b/roles/tesseractor/tasks/tesseract.yml
index ce05089..903853c 100644
--- a/roles/tesseractor/tasks/tesseract.yml
+++ b/roles/tesseractor/tasks/tesseract.yml
@@ -22,21 +22,13 @@
     dest: /home/ec2-user/src/leptonica
     version: addinstall
     depth: 1
-
-- name: Configure leptonica environ.h
-  lineinfile:
-    dest: /home/ec2-user/src/leptonica/src/environ.h
-    line: "{{ item }}"
-    insertbefore: "^#endif * LEPTONICA_ENVIRON_H"
-  with_items:
-    - "#define HAVE_FMEMOPEN 1"
-    - "#define HAVE_FSTATAT 1"
+    force: yes
 
 - name: Build leptonica
-  make:
+  command: make -f makefile.static SHARED=yes install
+  args:
     chdir: /home/ec2-user/src/leptonica/src
-    target: "-f makefile.static install"
-    params: SHARED=yes
+    creates: /usr/local/lib/liblept.a
 
 - name: Clone tesseract repository
   git:
@@ -46,4 +38,4 @@
     depth: 1
 
 - name: Build and install tesseract
-  make: chdir=/home/ec2-user/src/tesseract target=install
+  make: chdir=/home/ec2-user/src/tesseract/simplemake target=install
diff --git a/roles/tesstrainer/tasks/tesstraining.yml b/roles/tesstrainer/tasks/tesstraining.yml
index d00003f..2ef234d 100644
--- a/roles/tesstrainer/tasks/tesstraining.yml
+++ b/roles/tesstrainer/tasks/tesstraining.yml
@@ -29,21 +29,13 @@
     dest: /home/ec2-user/src/leptonica
     version: addinstall
     depth: 1
-
-- name: Configure leptonica environ.h
-  lineinfile:
-    dest: /home/ec2-user/src/leptonica/src/environ.h
-    line: "{{ item }}"
-    insertbefore: "^#endif * LEPTONICA_ENVIRON_H"
-  with_items:
-    - "#define HAVE_FMEMOPEN 1"
-    - "#define HAVE_FSTATAT 1"
+    force: yes
 
 - name: Build leptonica
-  make:
+  command: make -f makefile.static SHARED=yes install
+  args:
     chdir: /home/ec2-user/src/leptonica/src
-    target: "-f makefile.static install"
-    params: SHARED=yes
+    creates: /usr/local/lib/liblept.a
 
 - name: Clone tesseract repository
   git:
@@ -53,4 +45,4 @@
     depth: 1
 
 - name: Build and install tesseract training tools
-  make: chdir=/home/ec2-user/src/tesseract target=install-training
+  make: chdir=/home/ec2-user/src/tesseract/simplemake target=install-training
-- 
cgit v1.2.1-24-ge1ad