Fix pybabel invocation and make output more verbose

2 files changed, 8 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 1b345e9c..ed3ab587 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,10 @@ include config.mk
 all: locale template
 
 # Extract translateable strings from jinja2 templates.
+# Because of the local i18nfix extractor module we need
+# to set the pythonpath before invoking pybabel.
 locale/messages.pot: *.j2 common/*.j2.inc
-        $(BABEL) extract -F locale/babel.map -o locale/messages.pot .
+        PYTHONPATH=. $(BABEL) -v extract -F locale/babel.map -o locale/messages.pot .
 
 # Update translation (.po) files with new strings.
 locale-update: locale/messages.pot
@@ -29,11 +31,11 @@ locale-update: locale/messages.pot
 
 # Compile translation files for use.
 locale-compile:
-        $(BABEL) compile -d locale -l en --use-fuzzy
-        $(BABEL) compile -d locale -l de --use-fuzzy
-        $(BABEL) compile -d locale -l fr --use-fuzzy
-        $(BABEL) compile -d locale -l it --use-fuzzy
-        $(BABEL) compile -d locale -l es --use-fuzzy
+        $(BABEL) -v compile -d locale -l en --use-fuzzy
+        $(BABEL) -v compile -d locale -l de --use-fuzzy
+        $(BABEL) -v compile -d locale -l fr --use-fuzzy
+        $(BABEL) -v compile -d locale -l it --use-fuzzy
+        $(BABEL) -v compile -d locale -l es --use-fuzzy
 
 # Process everything related to gettext translations.
 locale: locale-update locale-compile
diff --git a/config.mk b/config.mk
index 026cacb0..8491416b 100644
--- a/config.mk
+++ b/config.mk
@@ -1,6 +1,3 @@
-GUIX_PYTHONPATH:=$(PYTHONPATH)
-PYTHONPATH=$(PWD):$(GUIX_PYTHONPATH)
-
 DEBUG=0
 
 PYTHON=python3