X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=146d3af083ca3611ce9e53c3dfd005d346a55264;hb=c7624021f74e8930484a0a732bb5800a2d58cbbd;hp=0cd13623ca424b7f24121594cd3421f89585107b;hpb=f514e24c0f2021ab2e8667dedb6f85ac44eaccd5;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 0cd13623ca..146d3af083 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
@@ -204,7 +208,7 @@ RESULT_DIR=$(top-build-dir)/out/test-results
 
 test:
 	@echo -en 'For tracking crashes: use\n\n\t'
-	@echo 'grep sourcefilename `grep -L systems.texi input/regression/out-test/*log|sed s/log/ly/g`'
+	@echo 'grep sourcefilename `grep -L systems.texi out/lybook-db/*/*log|sed s/log/ly/g`'
 	@echo
 	$(MAKE) -C input/regression/ out=test local-test
 	$(MAKE) -C input/regression/musicxml out=test local-test