(LINK_GXX_STATICALLY): use "" to allow $ expansion.

diff --git a/ChangeLog b/ChangeLog
index 5ac267e67ebc19699b7936d268b41587c663d821..7073c4554e5d19a7577d88b2b2cbeeba63d2fc0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-05-24  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * configure.in (LINK_GXX_STATICALLY): use "" to allow $ expansion.
+
        * Documentation/user/GNUmakefile (TEXI2DVI_FLAGS): add -E.
 
        * stepmake/stepmake/texinfo-rules.make ($(outdir)/%.dvi): add

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5f28601d9f6205c54fac9ef0bcbade0cbab1b348..41a3842cc0ce509218892dc3df39a8d2a76f8893 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -167,7 +167,7 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
 $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-force
        -rm -f $(tree-share-prefix)/fonts/{otf,svg,tfm,type1}/* &&  \
                cd $(tree-share-prefix)/fonts/otf && \
-               ln -s ../../../../../../mf/$(outconfbase)/*.{otf,ttf} .
+               ln -s ../../../../../../mf/$(outconfbase)/*.otf .
        -cd $(tree-share-prefix)/fonts/svg && \
                ln -s ../../../../../../mf/$(outconfbase)/*.svg .
        -cd $(tree-share-prefix)/fonts/tfm && \

diff --git a/configure.in b/configure.in
index 29bc273838b31128474f871fe242d554a8bdcba5..ce169f0d668b57ac6a886b98f121889a7fe33349 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -68,7 +68,7 @@ if test "$NCSB_DIR" != "" ;  then
 else
   if test "$FCMATCH" != ""; then
     for style in Roman Italic "Bold Italic" Bold; do
-      NCSB_FILE=`$FCMATCH --verbose 'Century Schoolbook L:style=$style' | grep 'file:'`
+      NCSB_FILE=`$FCMATCH --verbose "Century Schoolbook L:style=$style" | grep 'file:'`
 
       NCSB_FILE=`echo $NCSB_FILE | sed 's/^.*"\(.*\)".*$/\1/g'`
       NCSB_FILE=`readlink -f $NCSB_FILE`

diff --git a/input/no-notation/denneboom.ly b/input/no-notation/denneboom.ly
deleted file mode 100644 (file)
index b0eb5c3..0000000
--- a/input/no-notation/denneboom.ly
+++ /dev/null
@@ -1,116 +0,0 @@
-\version "2.7.39"
-\header{
-filename =      "denneboom.ly"
-enteredby =     "jcn"
-copyright =     "public domain"
-}
-%{ file tests silly line shapes %}
-
-#(set-global-staff-size 20)
-
-
-
-oden = \lyricmode{ 
-       O |
-       den- ne- boom, o | 
-       den- ne- boom  Wat |
-       zijn uw tak- ken | 
-       won- der- schoon 
-}
-
-ikheb = \lyricmode{
-       Ik | 
-       heb u laatst in_'t |
-       bos zien staan  toen |
-       zat- en er geen |
-       kaars- jes aan 
-}
-
-ugloeit = \lyricmode{
-       U |
-       gloeit in bar- re | 
-       win- ter- tijd, als |
-       sneeuw op aar- de | 
-       licht ge- spreid 
-}
-
-oboom = \transpose c c'{
-       g,8 |
-       c8. c16 c4. d8 | 
-       e8. e16 e4. e8 | 
-       d  e f4 b, | 
-       d8. c16 c4 r8
-}
-
-bos = \transpose c c'{
-       g8 | 
-       g e a4. g8 | 
-       g8. f16 f4 r8 f8 |
-       f d g4. f8 | 
-       f8. e16 e4 r8
-}
-
-
-melody = {
-       \oboom
-       \oboom
-       \bos
-       \oboom
-}
-
-
-verseOne = {
-       \oden
-       \oden
-       \ikheb
-       \oden
-}
-
-verseOneStaff = \new Lyrics =  "one" 
-       \verseOne
-
-
-verseTwo = {
-       \oden
-       \oden
-       \ugloeit
-       \oden
-}
-
-verseTwoStaff = \new Lyrics =  "two" 
-       \verseTwo
-
-
-denneboomShape = \layout{ 
-       \layoutTwenty
-       indent = 20. \mm
-
-       % UGH -- THIS IS HAIRY 
-       #'margin-shape = #(map
-               (lambda (x) (cons-map mm-to-pt x)) 
-               '((70.0 .  20.)
-                (65.0 .  30.0)
-                (57.5  .  45.0)
-                (50.0 .  60.0) 
-                (42.5  .  75.)  
-                (35.0 .  90.)
-                (27.5  .  105.)
-                (20.0 .  120.0)
-                (10.0 .  140.0) 
-                (65.0 .  30.0))
-       )
-
-       gourlay_maxmeasures = 30.
-       arithmetic_basicspace = 3.8
-       arithmetic_multiplier = 8.\pt
-}
-
-\score{
-       \oldaddlyrics
-               \context Staff { \time 3/4 \melody }
-               \context Lyrics \verseOne
-       \layout{ 
-               \denneboomShape 
-       }
-       \midi{ \tempo 4 = 90 }
-}