X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Ftexinfo-targets.make;h=492e1f636621a137c5687a030bf25664a5fac420;hb=9afca041a3068199609d98f580ffe2a175b90b0f;hp=488b81f24bac9423cce410b380e337f505f694e7;hpb=ec8bd524c40ef951bc00c9a15051793546cc5a55;p=lilypond.git

diff --git a/stepmake/stepmake/texinfo-targets.make b/stepmake/stepmake/texinfo-targets.make
index 488b81f24b..492e1f6366 100644
--- a/stepmake/stepmake/texinfo-targets.make
+++ b/stepmake/stepmake/texinfo-targets.make
@@ -2,7 +2,7 @@
 
 default: $(INFO_FILES)
 
-local-WWW: $(addprefix $(outdir)/,$(TEXI_FILES:.texi=.html))
+local-WWW-1: $(XREF_MAPS_FILES)
 
 local-doc: $(OUTTXT_FILES)
 
@@ -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,24 +48,31 @@ 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
 
-local-install-info: info
-	-$(INSTALL) -d $(DESTDIR)$(package_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"
@@ -78,7 +85,12 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
 	@echo
 	@echo "and read the extra instructions."
 	@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
@@ -88,7 +100,11 @@ else # installing directly into standard /usr/...
 	@echo
 	@echo "    make out=www install-info "
 	@echo
-endif # installing into standard /usr/* root# installing into /usr/...
+
+local-uninstall-info:
+	$(foreach f,$(INFO_FILES),install-info --remove --info-dir=$(infodir) $(f) ; )true
+
+endif # installing into standard /usr/* root
 
 endif # out!=www
 
@@ -117,4 +133,11 @@ texinfo-all-menus-update:
 	-$(foreach i, $(TEXINFO_SOURCES), echo q | emacs --batch --no-site-file $(i) --eval $(TEXINFO_ALL_MENUS_UPDATE_EL); )
 	$(foreach i, $(sort $(TEXINFO_SOURCES)), if diff -u $(i)~ $(i); then mv $(i)~ $(i);  fi && ) true
 
+local-help: local-texinfo-help
+
+local-texinfo-help:
+	@echo -e "\
+  info [out=www]  update Info documentation (use \`out=www' for having images)\n\
+  install-info [out=www]   install Info documentation (idem)\n\
+  texinfo-all-menus-update update node menus in Texinfo source files (use with caution)\n"