X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=0e30f80d3c5c8618ff019dead2226fb96bee37a4;hb=52ecddd2dd8c79a39a3ee46d85ddbeb232fe67eb;hp=cec5d29937371d6d3106fcc411c037f85b0662ab;hpb=0a06536c058cd7641a29a0b4c80cf9fd8e334fb2;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index cec5d29937..0e30f80d3c 100644
--- 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
@@ -87,7 +91,7 @@ WWW-post:
 	echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(top-build-dir)/.htaccess
 	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html input/
 	find $(outdir) -name '*-root' | xargs rm -rf
-	$(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) $(outdir) "$(WEB_TARGETS)"
 	find $(outdir)/offline-root -type l -delete