resolve merge

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

diff --git a/stepmake/stepmake/texinfo-targets.make b/stepmake/stepmake/texinfo-targets.make
index ede79d46e1dad4f116fff8efccef1f4b2ce4709b..487ee97e491998257c5f4f108770064b18f93b05 100644 (file)
--- a/stepmake/stepmake/texinfo-targets.make
+++ b/stepmake/stepmake/texinfo-targets.make
@@ -4,9 +4,11 @@ default: $(INFO_FILES)
 
 ifeq ($(out),www)
 local-WWW-1: $(XREF_MAPS_FILES)
+
+local-WWW-2: $(OUT_CSS_FILES)
 endif
 
-local-doc:  $(OUTTXT_FILES)
+local-txt-doc:  $(OUTTXT_FILES)
 
 check-info: texinfo-all-menus-update
 
@@ -41,7 +43,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)
@@ -161,8 +163,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)"