Merge pull request #56 from fancycode/automake_updates

Automake updates

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" \
@@ -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" ; \

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