Make targets: add web-uninstall and polish uninstall

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index eb4577dcc3dad493026e783bce15c736a495f10f..243c16441354cd0d6c9181f61a6cb2da186a8e40 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -47,11 +47,6 @@ info: $(INFO_FILES)
 xml: $(outdir)/lilypond/lilypond.xml $(outdir)/lilypond-internals/lilypond-internals.xml
 
 
-# All web targets, except info image symlinks and info docs are
-# installed in non-recursing target from TOP-SRC-DIR
-local-install-WWW: local-install-info
-local-uninstall-WWW: local-uninstall-info
-
 local-clean:
        rm -f $(INFO_IMAGES_DIR)
 

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5160939baa0669c84a907da04235d36dd3d92332..146d3af083ca3611ce9e53c3dfd005d346a55264 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

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 24f8f65aed78931837c548d82132f4b3dae5f68e..8421cc96e7c272333cdf80706d5393acf632d432 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -63,6 +63,7 @@ help: generic-help local-help
   exe         update all executables\n\
   help        this help\n\
   install *   install programs and data (prefix=$(prefix))\n\
+  uninstall*  uninstall programs and data\n\
   lib         update all libraries\n\
   web *       update website in directory \`out-www'\n\
   web-install * install website documentation in (webdir=$(webdir))\n\

diff --git a/stepmake/stepmake/texinfo-targets.make b/stepmake/stepmake/texinfo-targets.make
index 245b2e6c629d8296776af10fde966aac84b4efcb..a202bea7b976986c49d2f21a4af7c8d8ebb4cbe6 100644 (file)
--- a/stepmake/stepmake/texinfo-targets.make
+++ b/stepmake/stepmake/texinfo-targets.make
@@ -31,12 +31,12 @@ ifeq ($(out),www)
 # This builds all .info targets with images, in out-www.
 # Viewable with a recent Emacs, doing: C-u C-h i out-www/lilypond.info
 
-local-install-info: info
-       -$(INSTALL) -d $(DESTDIR)$(infodir)
 ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
 ## Can not have absolute symlinks because some binary packages build schemes
 ## install files in nonstandard root.  Best we can do is to notify the
 ## builder or packager.
+local-install-info: info
+       -$(INSTALL) -d $(DESTDIR)$(infodir)
        @echo
        @echo "***************************************************************"
        @echo "Please add or update the LilyPond direntries, do"
@@ -48,16 +48,23 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
        @echo "    (cd $(infodir) && ln -sfT ../doc/lilypond/html/$(DEST_INFO_IMAGES_SUBDIR) $(INFO_IMAGES_DIR))"
        @echo "or add something like that to the postinstall script."
        @echo
+
+local-uninstall-info:
+       -rmdir $(DESTDIR)$(infodir)
+
 else # installing directly into standard /usr/...
+local-install-info: info
        -$(INSTALL) -d $(DESTDIR)$(infodir)
        $(foreach f,$(INFO_FILES),install-info --remove --info-dir=$(infodir) $(f) ; )true
        install-info --info-dir=$(infodir) $(outdir)/$(MAIN_INFO_DOC).info
        cd $(infodir) && ln -sfT $(webdir)/$(DEST_INFO_IMAGES_SUBDIR) $(INFO_IMAGES_DIR)
-endif # installing directly into standard /usr/...
 
-local-uninstall-WWW:
+local-uninstall-info:
+       $(foreach f,$(INFO_FILES),install-info --remove --info-dir=$(infodir) $(f) ; )true
        rm -f $(infodir)/$(INFO_IMAGES_DIR)
 
+endif # installing directly into standard /usr/...
+
 else # out!=www
 
 ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
@@ -65,7 +72,7 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
 ## install files in nonstandard root.  Best we can do is to notify the
 ## builder or packager.
 local-install-info: info
-       -$(INSTALL) -d $(DESTDIR)$(package_infodir)
+       -$(INSTALL) -d $(DESTDIR)$(infodir)
        @echo
        @echo "***************************************************************"
        @echo "Please add or update the LilyPond direntries, do"
@@ -80,11 +87,10 @@ local-install-info: info
        @echo
 
 local-uninstall-info:
-       -rmdir $(DESTDIR)$(package_infodir)
+       -rmdir $(DESTDIR)$(infodir)
 
 else # installing directly into standard /usr/...
 local-install-info: info
-       -$(INSTALL) -d $(DESTDIR)$(package_infodir)
        -$(INSTALL) -d $(DESTDIR)$(infodir)
        $(foreach f,$(INFO_FILES),install-info --remove --info-dir=$(infodir) $(f) ; )true
        install-info --info-dir=$(infodir) $(outdir)/$(MAIN_INFO_DOC).info
@@ -97,8 +103,6 @@ local-install-info: info
 
 local-uninstall-info:
        $(foreach f,$(INFO_FILES),install-info --remove --info-dir=$(infodir) $(f) ; )true
-       -rmdir $(DESTDIR)$(infodir)
-       -rmdir $(DESTDIR)$(package_infodir)
 
 endif # installing into standard /usr/* root
 

diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index 1068981c11a0a962e599cc0407a52fa7919fcd17..bd2f3d7932ba848988966fb1334fd6c398d322b7 100644 (file)
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -52,6 +52,7 @@ dist:
 
 local-help:
        @echo -e "\
+  web-uninstall  remove installed documentation with images\n\
   config      rerun configure\n\
   dist        roll tarball: $(depth)/$(outdir)/$(distname).tar.gz\n\
   distclean   also remove configure output\n\