Clean fonts and docs makefiles, trying to fix 'make -j' race conditions

[lilypond.git] / stepmake / stepmake / texinfo-targets.make

diff --git a/stepmake/stepmake/texinfo-targets.make b/stepmake/stepmake/texinfo-targets.make
index e9cbf16aec7a1f91c5a2b85550c52de187985a5f..6dbc031de55d1df68a7f4f78dbb86e75062fc3af 100644 (file)
--- a/stepmake/stepmake/texinfo-targets.make
+++ b/stepmake/stepmake/texinfo-targets.make
@@ -2,9 +2,11 @@
 
 default: $(INFO_FILES)
 
-local-WWW-1: $(XREF_MAPS_FILES)
+ifeq ($(out),www)
+local-WWW-1: $(OUT_TEXINFO_MANUALS) $(XREF_MAPS_FILES)
+endif
 
-local-doc:  $(OUTTXT_FILES)
+local-txt-doc:  $(OUTTXT_FILES)
 
 check-info: texinfo-all-menus-update
 
@@ -39,7 +41,7 @@ install-info-images:
 # remove $(infodir)/$(INFO_IMAGES_DIR) in case it is a symlink
        -rm -f $(DESTDIR)$(infodir)/$(INFO_IMAGES_DIR)
        $(INSTALL) -d $(DESTDIR)$(infodir)/$(INFO_IMAGES_DIR)
-       rsync -r --include '[0-9a-f][0-9a-f]' --include '*.png' --exclude '*' $(outdir)/ $(DESTDIR)$(infodir)/$(INFO_IMAGES_DIR)/
+       rsync -r --include '[0-9a-f][0-9a-f]' --include '*.png' --exclude '*' $(outdir)/ $(DESTDIR)$(infodir)/$(INFO_IMAGES_DIR)
 
 uninstall-info-images:
        rm -f $(DESTDIR)$(infodir)/$(INFO_IMAGES_DIR) || rm -rf $(DESTDIR)$(infodir)/$(INFO_IMAGES_DIR)
@@ -54,7 +56,7 @@ endif # copying info images
 
 
 ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
-## install-info can't do all his job for binary packages build systems.
+## install-info can't do all its job for binary packages' build systems.
 ## Best we can do is to notify the builder or packager.
 local-install-info: info
        -$(INSTALL) -d $(DESTDIR)$(infodir)
@@ -111,7 +113,7 @@ local-install-info: info
        @echo "***************************************************************"
        @echo "To compile Info documentation with images, do from top of the build tree"
        @echo
-       @echo "    make web"
+       @echo "    make doc"
        @echo
        @echo "which builds documentation in all formats; to build only Info documentation, do"
        @echo
@@ -159,8 +161,9 @@ texinfo-all-menus-update:
 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"
+       @echo "  info [out=www]           update Info documentation"
+       @echo "                             (use \`out=www' for having images)"
+       @echo "  install-info [out=www]   install Info documentation (idem)"
+       @echo "  texinfo-all-menus-update update node menus in Texinfo source files"
+       @echo "                             (use with caution)"