From fcb7772036144d5e863a08ca17603bffa48e46be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
Date: Thu, 3 Jan 2019 22:43:55 +0100
Subject: [PATCH] Embed all the specific stuff into the Makefile

---
 .travis.yml | 2 +-
 Makefile    | 4 ++--
 ci/build.sh | 6 ------
 3 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100755 ci/build.sh

diff --git a/.travis.yml b/.travis.yml
index 684bfb2..c01bbc2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ cache: bundler
 before_install:
  - sh ci/install_po4a.sh
 script:
- - sh ci/build.sh
+ - make all
 addons:
   apt:
     packages:
diff --git a/Makefile b/Makefile
index d187875..f0e7f23 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ po4a.conf: create_po4a_conf.sh sources.txt
 	./create_po4a_conf.sh
 
 po4a-stamp: po4a.conf $(EN_SOURCES) $(LANGUAGE_PO) Makefile
-	$(QUIET_PO4A)po4a -v po4a.conf
+	$(QUIET_PO4A)PERL5LIB=./po4a/lib po4a/po4a -v po4a.conf
 	@touch $@
 
 update-sources:
@@ -36,7 +36,7 @@ update-sources:
 define MAKE_TARGET
 
 $(1)_$(2):
-	@echo $lang; cd $(2) && $(MAKE) -f ../makefile.locale $(1) lang=$(2)
+	@echo $lang;bundle exec $(MAKE) -C $(2) -f ../makefile.locale $(1) lang=$(2)
 
 $(1): $(1)_$(2)
 
diff --git a/ci/build.sh b/ci/build.sh
deleted file mode 100755
index f393c65..0000000
--- a/ci/build.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-export PERLLIB=$(pwd)/po4a/lib
-export PERL5LIB=$(pwd)/po4a/lib
-export PATH=$PATH:$(pwd)/po4a
-bundle exec make all
-- 
GitLab