diff --git a/.travis.yml b/.travis.yml index 684bfb214da0e28bac9e23de85a7ea5418eb2789..c01bbc2605801f1967363509eb1407962eb7b33a 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 d1878752e494daf9b377ad53fdc79453a1a92e83..f0e7f2342901af89b957d182279beceed8f570f1 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 f393c6581f66c01ef190ad19e5e199517f98dfd3..0000000000000000000000000000000000000000 --- 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