Merge branch 'master' of git://git.sv.gnu.org/lilypond

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 7665d5fb2f808f2ad76d53d85c65243a68d3611b..41962e0c594c5e3880aa5d2548fd8fe230de83c6 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -121,7 +121,7 @@ $(outdir)/aybabtu.fontname:
 $(outdir)/aybabtu.subfonts:
        echo $(subst .mf,,$(call src-wildcard,feta-braces-[a-z].mf)) > $@
 
-$(PE_SCRIPTS): $(buildscript-dir)/out/gen-emmentaler-scripts
+$(PE_SCRIPTS): $(top-build-dir)/buildscripts/$(outdir)/gen-emmentaler-scripts
        $(PYTHON) $< --dir=$(outdir)
 
 ALL_FONTS = $(FETA_FONTS)

diff --git a/scripts/lilypond-invoke-editor.scm b/scripts/lilypond-invoke-editor.scm
index e03a2afe0c0edb196bee2c00457ab0650f2b2b51..d847be27e9c0475e1063e1755e0b1166b686b930 100644 (file)
--- a/scripts/lilypond-invoke-editor.scm
+++ b/scripts/lilypond-invoke-editor.scm
@@ -127,15 +127,16 @@ Options:
 
 (define (strip-framework-path var)
   (define pat "lilypond/usr")
-  (let*
-      ((val (getenv var))
-       (paths (string-split val #\:))
-       (without (remove (lambda (s) (string-contains s pat))
-                       paths)))
-
-    (if (not (= (length without)
-               (length paths)))
-       (setenv var (string-join without ":")))))
+  (if (getenv var)
+      (let*
+         ((val (getenv var))
+          (paths (string-split val #\:))
+          (without (remove (lambda (s) (string-contains s pat))
+                           paths)))
+       
+       (if (not (= (length without)
+                   (length paths)))
+           (setenv var (string-join without ":"))))))
 
 (define (main args)
   (let ((files (parse-options args)))

diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index 69e08c6ef7910ead923e72401f0d598f03e0028d..8878b31ec137e14b3a5711f9177c0e111991a917 100644 (file)
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -66,8 +66,10 @@ local-help:
   .             to=0.1.74.jcn2\n\
   dist        roll tarball: $(depth)/$(outdir)/$(distname).tar.gz\n\
   distclean   also remove configure output\n\
-  doc         update all documentation\n\
+  doc         update all documentation (without images)\n\
   cvs-clean   also remove out directories and generated files\n\
+  info        update info docs (without images)\n\
+  info out=www  update info docs with images\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\