Merge branch 'master' into topic/master-translation

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index b1cc4ff6ba221ec1b1a4fd1e95495d5df14f4991..c9879725c8b6504c1237dea72e1fb82a98f7e7e1 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -98,7 +98,7 @@ local-WWW-post:
        $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html input/
        rm -rf $(outdir)/online-root
        rm -rf $(outdir)/offline-root
-       $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(outdir) "$(WEB_TARGETS)"
+       $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(outdir) "$(WEB_TARGETS)"
 
 
 tree-prefix = $(outdir)
@@ -228,10 +228,12 @@ test:
        @find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g' 
 
 
-test-baseline: test
+test-baseline: 
        @if  test -d .git ; then \
                $(if $(shell git diff), echo "commit before base lining" && false,true) ; \
        fi
+       $(MAKE) 
+       $(MAKE) test
        rm -rf input/regression/out-test-baseline
        mv input/regression/out-test input/regression/out-test-baseline