(FatalConversionError.conv): typo

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5238a31b15456457c460a472120baa3f4db4f7cf..703d4f177f52345c35d352c0a841d8dacd446c65 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -35,8 +35,15 @@ doc:
 
 pfa-fonts:
        $(MAKE) MAKE_PFA_FILES=1 -C mf
+ifeq (0,1)
+       # the font ball; used for 1.8.0
        (cd $(builddir)/share/lilypond/fonts && \
                tar czvf ../../../$(outbase)/type1.tar.gz type1/*.pfa type1/fonts.* type1/lilypond.* )
+else
+       # the new font ball; to be used for for 1.8.1
+       (cd $(builddir)/share/lilypond && \
+               tar czvf ../../$(outbase)/type1-$(TOPLEVEL_VERSION).tar.gz fonts/type1/*.pfa fonts/type1/fonts.* dvips/*.map )
+endif
 
 web-install: 
        -$(INSTALL) -m 755 -d $(webdir) 
@@ -54,11 +61,14 @@ final-install:
 
 web-ext = gz html midi pdf png txt ly
 
-footify=$(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
+footify = MAILADDRESS=bug-lilypond@gnu.org  $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
+
+bla:
+       cd $(builddir) && $(footify) `$(FIND) . -name '*.html' -print`
 
 local-WWW-post:  
        $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/examples.html ./
-       $(footify) `$(FIND) $(builddir) -name '*.html' -print`
+       cd $(builddir) && $(footify) `$(FIND) . -name '*.html' -print`
        cd $(builddir) && rm -f `find . -name \*.html~ -print`
        cd $(builddir) && find Documentation input \
                $(web-ext:%=-path '*/out-www/*.%' -or) -false \
@@ -141,5 +151,5 @@ $(config_h): configure.in aclocal.m4
 # maybe move into private script?
 rsync-web:
        cd out-www &&  mkdir web && tar  -xzf web.tar.gz -C web
-       cd out-www/web &&  rsync --delete --stats --progress -lavu -e ssh . x:/var/www/lilypond/doc/v1.8/
+       cd out-www/web &&  rsync --delete --stats --progress -rltvu -e ssh . x:/var/www/lilypond/doc/v1.9/
        cd out-www && rm -rf web/