X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=GNUmakefile.in;h=ac2329cf4fa68fd3d314a702cefd35682b7eed9e;hb=2687d717cfba7401f3c680542fdf192fb2fc2255;hp=aa7d227c592cb7615d2099cbfa3618441883a9f4;hpb=37c6de63d5f12cf9e42d04d56280aaf261ddc880;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index aa7d227c59..ac2329cf4f 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -22,7 +22,7 @@ TOPDOC_FILES = AUTHORS INSTALL README NEWS
 TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
 IN_FILES := $(call src-wildcard,*.in)
 
-EXTRA_DIST_FILES = VERSION .gitignore SConstruct \
+EXTRA_DIST_FILES = VERSION .gitignore SConstruct lilypond-texi2html.init \
   $(README_FILES) $(SCRIPTS) $(IN_FILES) 
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
@@ -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
@@ -195,6 +199,8 @@ $(config_h): config.hh.in
 	@echo
 	@false
 
+grand-replace:
+	PATH=$(buildscript-dir)/$(outbase):$(PATH) $(BASH) $(buildscript-dir)/grand-replace.sh
 
 ################################################################
 # testing