* lily/general-scheme.cc: Compile fixes: include wchar.h, string.h.

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

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index deb74de3db04725a5d2bdd82590e6f9bebe0dd5b..272fa15392a6650743abc12171469f441cb72656 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -48,22 +48,22 @@ webdir = $(local_package_docdir)
 help: generic-help local-help
        @echo -e "\
   all         update everything\n\
-  clean       remove all genated stuff in $(outdir)\n\
-  check       run selftest\n\
+  clean       remove all generated stuff in $(outdir)\n\
+  check       run self tests\n\
   default     same as the empty target\n\
   exe         update all executables\n\
   help        this help\n\
   install     install programs and data (prefix=$(prefix))\n\
   lib         update all libraries\n\
-  web         update website in out-www\n\
+  web         update website in directory \`out-www'\n\
   web-install install website documentation in (webdir=$(webdir))\n\
-  web-clean   clean out-www\n\
-  TAGS        genarate tagfiles\n\
+  web-clean   clean \`out-www' directory\n\
+  TAGS        generate tagfiles\n\
 \n\
-Make may be invoked from any subdirectory\n\
-Note that all commands recurse into SUBDIRS;\n\
-prepend \`local-' to do only cwd, eg: local-clean\n\
-"\
+\`make' may be invoked from any subdirectory.\n\
+Note that all commands recurse into subdirectories;\n\
+prepend \`local-' to restrict operation to the current directory.\n\
+Example: \`local-clean'.\n"
 
 local-help:
 
@@ -103,7 +103,7 @@ local-tags:
 $(outdir)/version.hh: $(depth)/VERSION $(config_make)
        $(PYTHON) $(step-bindir)/make-version.py $< > $@
 
-$(outdir)/config.h: $(config_h)
+$(outdir)/config.hh: $(config_h)
        cp -p $< $@
 
 configure: configure.in aclocal.m4
@@ -135,17 +135,17 @@ uninstall: local-uninstall
 local-uninstall:
 
 installextradoc:
-       -$(INSTALL) -d $(prefix)/doc/$(package)
+       -$(INSTALL) -d $(DESTDIR)$(prefix)/doc/$(package)
        $(foreach i, $(EXTRA_DOC_FILES),\
                cp -r $(i) $(prefix)/doc/$(package) &&) true
 
-include $(outdir)/dummy.dep $(DEP_FILES) # expect a warning here
+include $(outdir)/dummy.dep $(wildcard $(outdir)/*.dep) # expect a warning here
 
 $(outdir)/dummy.dep:
+       @echo please ignore innocent warning about dummy.dep
        -mkdir -p $(outdir)
        touch $(outdir)/dummy.dep
 
-
 check: local-check
        $(LOOP)