* configure.in (NCSB_DIR): --enable-ncsb-dir

* mf/GNUmakefile ($(NCSB_TTFS)): NCSB_DIR iso. NCSB_PATH.

* configure.in (LINK_GXX_STATICALLY): --enable-ncsb-path option.
use locate to find c059033l.pfb.

diff --git a/ChangeLog b/ChangeLog
index 0a662571dbc1e5026a769d9d25d09128e7895300..bd2eaaf6540bece1bd87605a23f0024fade6095e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-01-02  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * configure.in (NCSB_DIR): --enable-ncsb-dir
+
+       * mf/GNUmakefile ($(NCSB_TTFS)): NCSB_DIR iso. NCSB_PATH. 
+
        * configure.in (LINK_GXX_STATICALLY): --enable-ncsb-path option. 
        use locate to find c059033l.pfb. 
        

diff --git a/config.make.in b/config.make.in
index 6d7dea2de82ef7e81513e33ec8d0ebccce296265..bd28f57ceebc35a39fec45168db5d2b10b0596ee 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -87,7 +87,7 @@ webdir = $(lilypond_docdir)/html
 vimdir = $(lilypond_datadir)/vim
 
 
-NCSB_PATH = @NCSB_PATH@
+NCSB_DIR = @NCSB_DIR@
 
 ################################################################
 ## PROGRAMS

diff --git a/configure.in b/configure.in
index f4667f77b70e5b1b17e3287bdc1d2a3b6a2a3237..42c529d949d9b7191fa5b5e60b3b8f3cc6b33bb4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,11 +34,11 @@ AC_ARG_ENABLE(gui,
     [gui_b=$enableval])
 
 
-NCSB_PATH=unknown
-AC_ARG_ENABLE(gui,
-[  --enable-ncsb-path      set the path where Century Schoolbook fonts can be found.
+NCSB_DIR=unknown
+AC_ARG_ENABLE(ncsb,
+[  --enable-ncsb-dir      set the path where Century Schoolbook fonts can be found.
                             Default: detect with locate(1)],
-    [NCSB_PATH=$enableval])
+    [NCSB_DIR=$enableval])
 
 
 reloc_b=no
@@ -118,21 +118,21 @@ if test "$reloc_b" = "yes"; then
 fi
 
 AC_MSG_CHECKING([New Century Schoolbook PFB files])
-if test "$NCSB_PATH" = "unknown"; then
+if test "$NCSB_DIR" = "unknown"; then
   which locate >& /dev/null
   if test "$?" = "0"; then
       ## sort to give precedence to /usr/  
-      NCSB_PATH=`locate c059033l.pfb | sort -r | head -1`
-      if then "$NCSB_PATH" = "";
+      NCSB_DIR=`locate c059033l.pfb | sort -r | head -1`
+      if then "$NCSB_DIR" = "";
          AC_MSG_WARN(Could not find c059033l.pfb. Use --enable-ncsb-path to set path)
       fi
-      NCSB_PATH=`dirname "$NCSB_PATH"`
+      NCSB_DIR=`dirname "$NCSB_DIR"`
   else
      AC_MSG_WARN(Could not find locate(1). Use --enable-ncsb-path to set path to c059033l.pfb)
   fi
 fi
-AC_MSG_RESULT($NCSB_PATH)
-AC_SUBST(NCSB_PATH)
+AC_MSG_RESULT($NCSB_DIR)
+AC_SUBST(NCSB_DIR)
 
 STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)
 #STEPMAKE_PANGO(pango, REQUIRED, 1.6.0)

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 13ebabb5a49acd7910da8bd2ea5d01fc97f2efd9..01f563283ffe3843d39871b7bf77d4047bb53947 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -255,7 +255,7 @@ local-uninstall:
        -rmdir $(DESTDIR)$(local_lilypond_datadir)/dvips
 
 
-$(NCSB_TTFS): $(addsuffix .pfb,$(addprefix $(NCSB_PATH)/,$(NCSB_SOURCE_FILES)))
+$(NCSB_TTFS): $(addsuffix .pfb,$(addprefix $(NCSB_DIR)/,$(NCSB_SOURCE_FILES)))
        $(foreach i,$(NCSB_SOURCE_FILES), \
                $(FONTFORGE) -script $(buildscript-dir)/pfx2ttf.fontforge \
-                       $(NCSB_PATH)/$(i).pfb $(NCSB_PATH)/$(i).afm $(outdir)/ && ) true
+                       $(NCSB_DIR)/$(i).pfb $(NCSB_DIR)/$(i).afm $(outdir)/ && ) true