resolve merge

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

diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index 94f9e234f3a03898b770464957d8a756541dd8a3..d2748a97a3280e2e16ea575485ba9b2c40b2fe11 100644 (file)
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -9,9 +9,9 @@ local-distclean:
                config.cache config.status config.log index.html \
                stepmake/stepmake/stepmake stepmake/stepmake/bin
        rm -rf autom4te.cache
+       rm -rf $(outdir)
 
 local-maintainerclean:
-       rm -f configure
 
 GNUmakefile: GNUmakefile.in
        $(MAKE) INFILE=$< OUTFILE=$@ -f $(stepdir)/automatically-generated.sub.make
@@ -27,7 +27,7 @@ endif
 
 
 $(package-icon):
-       $(MAKE) -C Documentation/pictures icon
+       $(MAKE) -C Documentation/logo icon
 
 
 top-doc:
@@ -52,27 +52,32 @@ dist:
        chmod -R a+r $(distdir)
        chmod  a+x `find $(distdir) -type d -print`
        (cd ./$(depth)/$(outdir); $(TAR) -cf -  --owner=0 --group=0 $(DIST_NAME) | gzip -9 > $(DIST_NAME).tar.gz)
-       rm -rf $(distdir)/
+       rm -rf $(distdir)
 
 local-help:
-       @echo -e "\
-  config      rerun configure\n\
-  dist        roll tarball: $(depth)/$(outdir)/$(distname).tar.gz\n\
-  distclean   also remove configure output\n\
-  cvs-clean   also remove out directories and generated files\n\
-  maintainerclean also remove distributed generated files\n\
-  po          make new translation Portable Object database\n\
-  po-replace  do po-update and replace catalogs with msgmerged versions\n\
-  po-update   update translation Portable Object database\n\
-\n\
-  install-doc install website documentation in (webdir=$(webdir))\n\
-              and Info documentation with images\n\
-  uninstall-doc remove installed documentation with images\n\
-  info        build Info documentation with images\n\
-  install-info  install Info documentation with images\n\
-\n\
-Some more targets are available for testing changes:\n\
-  test-baseline  check  test-redo  test-clean\n\
-For more information on these targets, see Testing LilyPond\n\
-in Application Usage documentation.\n"
+       @echo "  config          rerun configure"
+       @echo "  dist            roll tarball: $(depth)/$(outdir)/$(distname).tar.gz"
+       @echo "  distclean       also remove configure output"
+       @echo "  cvs-clean       also remove out directories and generated files"
+       @echo "  maintainerclean also remove distributed generated files"
+       @echo "  po              make new translation Portable Object database"
+       @echo "  po-replace      do po-update and replace catalogs with msgmerged versions"
+       @echo "  po-update       update translation Portable Object database"
+       @echo
+       @echo "  install-doc     install website documentation in"
+       @echo "                    (webdir=$(webdir))"
+       @echo "                    and Info documentation with images"
+       @echo "  uninstall-doc   remove installed documentation with images"
+       @echo "  info            build Info documentation with images"
+       @echo "  install-info    install Info documentation with images"
+       @echo
+       @echo "Some more targets are available for testing changes:"
+       @echo "  test-baseline"
+       @echo "  check"
+       @echo "  test-redo"
+       @echo "  test-clean"
+       @echo
+       @echo "  For more information on these targets, see"
+       @echo "    \`Testing LilyPond' in the Contributor's Guide."
+       @echo