[taler-www] branch master updated (2408820 -> 3e26285)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a change to branch master
in repository www.

    from 2408820  make install: adjust to location in $HOME
     new 780bdb8  update submodule
     new aa40f63  bump
     new 4578671  bump
     new 3e26285  make install, uninstall: fix rules and require variant to be 
set.

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 GNUmakefile                      | 11 ++++++++---
 build-system/taler-build-scripts |  2 +-
 configure.py                     |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 030f8e5..f694f44 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -68,13 +68,18 @@ run: all
        $(browser) http://0.0.0.0:8000/rendered/en &
        $(python) -m http.server
 
+ifndef variant
+$(error variant is not set)
+endif
+
 .PHONY: install
 install: all
-       $(mkdir) -p $(prefix)/www.taler.net/
-       $(cp) -r rendered/* $(prefix)/www.taler.net/
+       $(mkdir) -p $(prefix)/$(variant)
+       $(cp) -r rendered/* $(prefix)/$(variant)/
 
 .PHONY: uninstall
-       $(rm) -rf $(prefix)/www.taler.net/
+uninstall:
+       $(rm) -rf $(prefix)/$(variant)
 
 .PHONY: clean
 clean:
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
index d725a0c..dd000ee 160000
--- a/build-system/taler-build-scripts
+++ b/build-system/taler-build-scripts
@@ -1 +1 @@
-Subproject commit d725a0cd1b4aa3ff54452a702b8c19db3f3c3393
+Subproject commit dd000ee983962b11a94cd0fcaa6d46ba9699b456
diff --git a/configure.py b/configure.py
index beea0c2..e68c4c4 100644
--- a/configure.py
+++ b/configure.py
@@ -13,6 +13,7 @@ from talerbuildconfig import *
 
 b = BuildConfig()
 b.enable_prefix()
+b.enable_variant()
 b.enable_configmk()
 b.add_tool(PythonTool())
 b.add_tool(PyBabelTool())

-- 
To stop receiving notification emails like this one, please contact
address@hidden.