From: Patrick McCarty <pnorcks@gmail.com>
Date: Thu, 27 Aug 2009 21:17:55 +0000 (-0700)
Subject: Fix `make install', and fix #812
X-Git-Tag: release/2.12.3-1~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=b8c66cadfa52c1c5b32ba35166d9b2099f627726;p=lilypond.git

Fix `make install', and fix #812
(cherry picked from commit 49615843397b02f4a1560b620a83b343517cebfc)
---

diff --git a/configure.in b/configure.in
index 7c2c6c2de9..d91d5c6364 100644
--- a/configure.in
+++ b/configure.in
@@ -73,11 +73,8 @@ if test "$NCSB_DIR" != "" ;  then
 else
   if test "$FCLIST" != ""; then
     for style in Roman Italic "Bold Italic" Bold; do
-      NCSB_FILE=`$FCLIST --verbose "Century Schoolbook L:style=$style:foundry=urw" \
-                | grep 'file:' \
-                | grep -v "\.@<:@ot@:>@tf"`
-
-      NCSB_FILE=`echo $NCSB_FILE | sed 's/^.*"\(.*\)".*$/\1/g'`
+      NCSB_FILE=`$FCLIST "Century Schoolbook L:style=$style:foundry=urw:fontformat=Type 1" file`
+      NCSB_FILE=`echo $NCSB_FILE | sed 's/^\(.*\):$/\1/g'`
       NCSB_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $NCSB_FILE`
       NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES"
     done