build-system: make it build on more systems.

Signed-off-by: Nils Gillmann <ng0@n0.is>

3 files changed, 27 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index fdd2c37b..3fae1b63 100644
--- a/Makefile
+++ b/Makefile
@@ -3,17 +3,17 @@
 # All: build HTML pages in all languages and compile the
 # TypeScript logic in web-common.
 
-PYTHONPATH="$PYTHONPATH:$(pwd)"
+include config.mk
 
 all: locale template
 
-# Extract translateable strings from jinga2 templates.
+# Extract translateable strings from jinja2 templates.
 locale/messages.pot: *.j2 common/*.j2.inc
         pybabel extract -F locale/babel.map -o locale/messages.pot .
 
 # Update translation (.po) files with new strings.
 locale-update: locale/messages.pot
-        msgmerge -U -m --previous locale/en/LC_MESSAGES/messages.po locale/messages.pot 
+        msgmerge -U -m --previous locale/en/LC_MESSAGES/messages.po locale/messages.pot
         msgmerge -U -m --previous locale/de/LC_MESSAGES/messages.po locale/messages.pot
         msgmerge -U -m --previous locale/fr/LC_MESSAGES/messages.po locale/messages.pot
         msgmerge -U -m --previous locale/es/LC_MESSAGES/messages.po locale/messages.pot
@@ -32,9 +32,9 @@ locale-compile:
 # Process everything related to gettext translations.
 locale: locale-update locale-compile
 
-# Run the jinga2 templating engine to expand templates to HTML
+# Run the jinja2 templating engine to expand templates to HTML
 # incorporating translations.
 template: locale-compile
-        ./template.py
+        $(PYTHON) ./template.py
 
 it: template
diff --git a/config.mk b/config.mk
new file mode 100644
index 00000000..0b183e9b
--- /dev/null
+++ b/config.mk
@@ -0,0 +1,5 @@
+#PYTHONPATH="$PYTHONPATH:$(pwd)"
+
+DEBUG=0
+
+PYTHON=python3
diff --git a/guix-env.scm b/guix-env.scm
index 588aa3ad..92a7845a 100644
--- a/guix-env.scm
+++ b/guix-env.scm
@@ -33,9 +33,11 @@
  (gnu packages base)
  (gnu packages compression)
  (gnu packages curl)
+ (gnu packages check)
  (gnu packages databases)
  (gnu packages file)
  (gnu packages gettext)
+ (gnu packages less)
  (gnu packages glib)
  (gnu packages gnome)
  (gnu packages gnunet)
@@ -83,11 +85,14 @@
       (inputs
        `(("python-jinja2" ,python-jinja2)
          ("python-babel" ,python-babel)
+         ("python-pylint" ,python-pylint)
          ("python-oslo.i18n" ,python-oslo.i18n)
+         ("python-future" ,python-future)
          ("gettext-minimal" ,gettext-minimal)
          ("python" ,python)
          ("coreutils" ,coreutils)
          ("which" ,which)
+         ("less" ,less)
          ("git" ,git)
          ("automake" ,automake)
          ("autoconf" ,autoconf-wrapper)))
@@ -100,18 +105,18 @@
                (for-each (lambda (po)
                            (chmod po #o666))
                          (find-files "." "\\.po$"))))
-           (replace 'configure
-             (lambda* (#:key outputs inputs #:allow-other-keys)
-               (let ((pystore (assoc-ref inputs "python"))
-                     (pyver ,(version-major+minor (package-version python))))
-                 (substitute* "Makefile"
-                   (("env PYTHONPATH=\".\"")
-                    (string-append
-                     "env PYTHONPATH=\""
-                     (getenv "PYTHONPATH")
-                     ":"
-                     "."
-                     "\""))))))
+           ;; (replace 'configure
+           ;;   (lambda* (#:key outputs inputs #:allow-other-keys)
+           ;;     (let ((pystore (assoc-ref inputs "python"))
+           ;;           (pyver ,(version-major+minor (package-version python))))
+           ;;       (substitute* "Makefile"
+           ;;         (("env PYTHONPATH=\".\"")
+           ;;          (string-append
+           ;;           "env PYTHONPATH=\""
+           ;;           (getenv "PYTHONPATH")
+           ;;           ":"
+           ;;           "."
+           ;;           "\""))))))
            ;; FIXME: Implement small testsuite.
            (delete 'check))))
       (synopsis "GNUnet website generation")