From d3c2c3bcd7d7e39d5fea13b879f4bb6d58d31b6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
Date: Sat, 5 Jan 2019 13:44:49 +0100
Subject: [PATCH] Remove invocation of bundle from inside Makefile
* when calling from withing git's Documentation dir, using bundler
might not be desired.
* encapsulating recursive Makefile calls inside bundler breaks the job
server of GNU make and generates a warning.
---
.travis.yml | 2 +-
Makefile | 2 +-
README | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c01bbc2..bb33a2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ cache: bundler
before_install:
- sh ci/install_po4a.sh
script:
- - make all
+ - bundle exec make all
addons:
apt:
packages:
diff --git a/Makefile b/Makefile
index 500c922..52d8713 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ update-sources:
define MAKE_TARGET
$(1)_$(2):
- @echo $lang;bundle exec $(MAKE) -C $(2) -f ../makefile.locale $(1) lang=$(2)
+ +$(MAKE) -C $(2) -f ../makefile.locale $(1) lang=$(2)
$(1): $(1)_$(2)
diff --git a/README b/README
index a337fcb..62ddd98 100644
--- a/README
+++ b/README
@@ -161,7 +161,7 @@ compilation toolchain which you can get by running:
Before you submit your changes do:
- $ make all
+ $ bundle exec make all
On systems with GNU gettext (i.e. not Solaris) and po4a this will try
to merge translations with the source asciidoc files into translated
--
GitLab