X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=b067305f9dcf38c807099c986524dd54bd279cec;hb=13ca4123d326ade652522703a5d15186971318e2;hp=3651171c46e5e6686f0356f0deb3cae873c37e73;hpb=543171165412bc915d8ea1f308d070c74924b2f1;p=lilypond.git diff --git a/configure.in b/configure.in index 3651171c46..b067305f9d 100644 --- a/configure.in +++ b/configure.in @@ -73,10 +73,10 @@ 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/aux/readlink.py" $NCSB_FILE` + NCSB_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $NCSB_FILE` NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES" done else @@ -189,7 +189,7 @@ STEPMAKE_GUILE(OPTIONAL) STEPMAKE_PERL(OPTIONAL) STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11) -STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.79) +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 <