Skip to content
Snippets Groups Projects
Commit d3c2c3bc authored by Jean-Noël Avila's avatar Jean-Noël Avila
Browse files

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.
parent a0fb772a
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,7 @@ cache: bundler ...@@ -4,7 +4,7 @@ cache: bundler
before_install: before_install:
- sh ci/install_po4a.sh - sh ci/install_po4a.sh
script: script:
- make all - bundle exec make all
addons: addons:
apt: apt:
packages: packages:
......
...@@ -38,7 +38,7 @@ update-sources: ...@@ -38,7 +38,7 @@ update-sources:
define MAKE_TARGET define MAKE_TARGET
$(1)_$(2): $(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) $(1): $(1)_$(2)
......
...@@ -161,7 +161,7 @@ compilation toolchain which you can get by running: ...@@ -161,7 +161,7 @@ compilation toolchain which you can get by running:
Before you submit your changes do: 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 On systems with GNU gettext (i.e. not Solaris) and po4a this will try
to merge translations with the source asciidoc files into translated to merge translations with the source asciidoc files into translated
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment