[GNUnet-SVN] [taler-playground] branch master updated: fix build

[gnunet]

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

dold pushed a commit to branch master
in repository playground.

The following commit(s) were added to refs/heads/master by this push:
     new 67e542f  fix build
67e542f is described below

commit 67e542f2254fba4ea141442ac138a13b559e09e1
Author: Florian Dold <address@hidden>
AuthorDate: Tue Mar 6 16:18:37 2018 +0100

    fix build
---
 .gitmodules                                        |  2 +-
 Makefile.in                                        | 19 ++++++-------------
 talerplayground/playground/{ => static}/web-common |  0
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index d0c1f7c..ba2fb2c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "talerplayground/playground/web-common"]
-       path = talerplayground/playground/web-common
+       path = talerplayground/playground/static/web-common
        url = git://taler.net/web-common
        branch = master
diff --git a/Makefile.in b/Makefile.in
index c7b8750..134b48d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,14 +4,14 @@ INSTALL_DATA = $(INSTALL) -m 644
 prefix = @prefix@
 srcdir = @srcdir@
 
-script_templates = taler-merchant-donations frontend-donations.wsgi
+script_templates = taler-merchant-playground frontend-playground.wsgi
 templates = Makefile $(script_templates)
 
 edit = sed -e 's|@address@hidden|$(prefix)|g'
 
 .PHONY: all
 all: $(templates)
-       cd talerdonations/donations/static/web-common && make && cd -
+       cd talerplayground/playground/static/web-common && make && cd -
 
 Makefile: Makefile.in
        ./config.status $@
@@ -21,35 +21,28 @@ $(script_templates): %: Makefile %.in
        $(edit) '$(srcdir)/address@hidden' >address@hidden
        mv address@hidden $@
 
-
 .PHONY: install-data
 install-data: $(templates)
-       @$(INSTALL_DATA) -Dt $(prefix)/share/taler/ frontend-donations.wsgi
-
-#      @test -n "$$(ls -A talerbank/app/static/web-common/)" || \
-#      (echo "please check out git submodules"; exit 1)
-
-
+       @$(INSTALL_DATA) -Dt $(prefix)/share/taler/ frontend-playground.wsgi
 
 # link package under prefix to source tree
 .PHONY: devinstall
 devinstall: $(templates) install-data
        @pip3 install -e . --install-option="address@hidden@"
 
-
 # install into prefix
 .PHONY: install
 install: $(templates) install-data
        @pip3 install . --install-option="address@hidden@"
        @# force update when sources changed
        @pip3 install . --install-option="address@hidden@" --upgrade --no-deps
-       cd talerdonations/donations/static/web-common && make install && cd -
+       cd talerplayground/playground/static/web-common && make install && cd -
 
 # run testcases
 .PHONY: check
 check:
-       @export address@hidden@/talerdonations/tests.conf; \
+       @export address@hidden@/talerplayground/tests.conf; \
         python3 setup.py test
 
 pylint:
-       @pylint talerdonations/
+       @pylint talerplayground/
diff --git a/talerplayground/playground/web-common 
b/talerplayground/playground/static/web-common
similarity index 100%
rename from talerplayground/playground/web-common
rename to talerplayground/playground/static/web-common

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