Merge branch 'master' into dev/texi2html

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index aa7d227c592cb7615d2099cbfa3618441883a9f4..0e30f80d3c5c8618ff019dead2226fb96bee37a4 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -51,22 +51,26 @@ dist-toplevel-txt-files:
 doc: 
        $(MAKE) -C Documentation
 
+install-help2man:
+       $(MAKE) -C scripts man install-help2man
+       $(MAKE) -C lily man install-help2man
+
+# All web targets, except info image symlinks and info docs are
+# installed in non-recursing target from TOP-SRC-DIR
 install-WWW:
        -$(INSTALL) -m 755 -d $(DESTDIR)$(webdir)
        rsync -rl $(outdir)/offline-root/ $(DESTDIR)$(webdir)
-       $(MAKE) -C Documentation/user local-install-WWW
        $(MAKE) -C Documentation/user install-info
        $(MAKE) -C input/lsr install-info
 
-install-help2man:
-       $(MAKE) -C scripts man install-help2man
-       $(MAKE) -C lily man install-help2man
-
 web-install:
        $(MAKE) out=www install-WWW
 
 uninstall-WWW:
-       echo TODO
+       rm -rf $(DESTDIR)$(webdir)
+       -rmdir $(package_docdir)
+       $(MAKE) -C Documentation/user uninstall
+       $(MAKE) -C input/lsr uninstall
 
 web-uninstall:
        $(MAKE) out=www uninstall-WWW