* stepmake/stepmake/omf-targets.make (local-install): add

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 6983fb6199cfbbfce873b076fb6de0e263aa6987..93609bb70186335086c1da9b34e240f88a8833cf 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -54,15 +54,13 @@ web-doc: web-reqs
 pfa-fonts:
        $(MAKE) MAKE_PFA_FILES=1 -C mf
 
-docdir = $(prefix)/share/doc/lilypond-$(TOPLEVEL_VERSION)
-install-html-doc: html-doc
-       $(INSTALL) -d $(docdir)/html 
-       tar -C $(docdir)/html -zxf $(outdir)/web.tar.gz
+install-html-doc: web-doc top-web
+       $(INSTALL) -m 755 -d $(local_package_docdir) 
+       tar -C $(local_package_docdir)/ -xzf $(outdir)/web.tar.gz
 
 # KPATHSEA=0: Hack for compiling without kpathsea -- not recommended
 my_tfm_path = $(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp 
 
-
 local-install:
        $(INSTALL) -d $(local_lilypond_datadir)
 ifeq ($(KPATHSEA),0)
@@ -91,10 +89,6 @@ lily/$(outdir)/lilypond:
 local-web: web-doc $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
 
 
-web-doc-install: web-doc
-       $(INSTALL) -m 755 -d $(local_package_docdir) 
-       tar -C $(local_package_docdir)/ -xzf $(outdir)/web.tar.gz
-
 web-ext = gz html midi pdf png txt ly
 top-web:
        cd $(builddir) && rm -f `find . -name \*.html~ -print`