commit 3e26285cefa3a0c72d09203cc2a11ff9d5fb42a9 parent 4578671be7d21bc03c17ba61fe27fed8ab6cd742 Author: ng0 <ng0@taler.net> Date: Sat, 14 Dec 2019 14:50:58 +0000 make install, uninstall: fix rules and require variant to be set. Diffstat:
| M | GNUmakefile | | | 11 | ++++++++--- |
| M | configure.py | | | 1 | + |
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git 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/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())