X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=b067305f9dcf38c807099c986524dd54bd279cec;hb=dc1af73a4a34799c3e5492b32d0ea148a856b5bf;hp=2cc862690a7df5db08357433b1e962efb2dbfa7b;hpb=16489815816abbd6cdfd2983edfce46b4e657b94;p=lilypond.git

diff --git a/configure.in b/configure.in
index 2cc862690a..b067305f9d 100644
--- a/configure.in
+++ b/configure.in
@@ -73,7 +73,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:' | grep -v "\.ttf"`
+      NCSB_FILE=`$FCMATCH --verbose "Century Schoolbook L:style=$style:foundry=urw" | grep 'file:' | grep -v "\.ttf"`
 
       NCSB_FILE=`echo $NCSB_FILE | sed 's/^.*"\(.*\)".*$/\1/g'`
       NCSB_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $NCSB_FILE`
@@ -189,7 +189,7 @@ STEPMAKE_GUILE(OPTIONAL)
 STEPMAKE_PERL(OPTIONAL)
 
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
-STEPMAKE_PROGS(TEXI2HTML, texi2html, REQUIRED, 1.80)
+STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.80)
 
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 
@@ -205,6 +205,11 @@ STEPMAKE_END
 
 test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc=""
 
+if make top-doc 1>/dev/null 2>&1; then
+    rm -f INSTALL.txt && ln Documentation/topdocs/out/INSTALL.txt .
+    rm -f README.txt && ln Documentation/topdocs/out/README.txt .
+fi
+
 cat <<EOF
 
 Type: