From 260d80c44404b1446d52385e58dd9392eaabf086 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Mon, 30 Jun 2014 18:21:37 +0200 Subject: [PATCH 1/3] Use absolute filename to `babel.cfg`. --- src/i18n/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/Makefile.am b/src/i18n/Makefile.am index 8adadf8a..c2955cb8 100644 --- a/src/i18n/Makefile.am +++ b/src/i18n/Makefile.am @@ -33,7 +33,7 @@ build: update extract: @if [ "$(PYBABEL)" = "" ]; then echo "Command 'pybabel' not found, required when extracting i18n"; exit 1; fi - $(PYBABEL) extract -F babel.cfg --no-default-keywords -k _n:1,2 -k _ \ + $(PYBABEL) extract -F "$(CURDIR)/babel.cfg" --no-default-keywords -k _n:1,2 -k _ \ --no-location --project="$(I18N_PROJECT)" --version="$(I18N_VERSION)" \ --copyright-holder="$(I18N_COPYRIGHT)" --msgid-bugs-address="$(I18N_BUG_ADDRESS)" \ -o "$(CURDIR)/messages.pot" \ From 0ae23ea26770cee7f1fabc5bb0ffd58143aaae70 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Mon, 30 Jun 2014 18:21:58 +0200 Subject: [PATCH 2/3] Use `grep` as detected by `configure`. --- src/i18n/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/Makefile.am b/src/i18n/Makefile.am index c2955cb8..c767b5d2 100644 --- a/src/i18n/Makefile.am +++ b/src/i18n/Makefile.am @@ -51,7 +51,7 @@ update: @if [ "$(PYBABEL)" = "" ]; then echo "Command 'pybabel' not found, required when updating i18n"; exit 1; fi for lang in $(LANGUAGES) ; do \ l=$$lang ; \ - if echo $$l | grep -q -; then \ + if echo $$l | $(GREP) -q -; then \ l=`echo $$lang | $(AWK) '{split($$0,a,"-"); printf "%s_%s", a[1],toupper(a[2])}'` ; \ fi ; \ $(PYBABEL) update -l $$l -i "$(CURDIR)/messages.pot" -o "$(CURDIR)/messages-$$lang.po" ; \ From 3136119d206041424c309ff05a602e05e020e1a6 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Mon, 30 Jun 2014 18:23:21 +0200 Subject: [PATCH 3/3] Check for requirements when executing `make styleshint`. --- src/styles/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/styles/Makefile.am b/src/styles/Makefile.am index bf115db3..07ba53e3 100644 --- a/src/styles/Makefile.am +++ b/src/styles/Makefile.am @@ -38,4 +38,6 @@ styles: $(CURDIR)/font-awesome.scss:$(STATIC)/css/font-awesome.min.css styleshint: + @if [ "$(SASS)" = "" ]; then echo "Command 'sass' not found, required when checking styles"; exit 1; fi + @if [ "$(SASS_SUPPORT_STYLES)" = "no" ]; then echo "Your version of sass does not support checking styles"; exit 1; fi $(FIND) ./ -maxdepth 1 -name "*.scss" -print0 | xargs -0 -n1 $(SASS) --compass --scss $(SASSFLAGS) -c