* mf/GNUmakefile ($(NCSB_TTFS)): NCSB_DIR iso. NCSB_PATH.
* configure.in (LINK_GXX_STATICALLY): --enable-ncsb-path option.
use locate to find c059033l.pfb.
2006-01-02 Han-Wen Nienhuys <hanwen@xs4all.nl>
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.
* configure.in (LINK_GXX_STATICALLY): --enable-ncsb-path option.
use locate to find c059033l.pfb.
vimdir = $(lilypond_datadir)/vim
vimdir = $(lilypond_datadir)/vim
################################################################
## PROGRAMS
################################################################
## PROGRAMS
-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)],
Default: detect with locate(1)],
- [NCSB_PATH=$enableval])
fi
AC_MSG_CHECKING([New Century Schoolbook PFB files])
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/
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
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
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)
STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)
#STEPMAKE_PANGO(pango, REQUIRED, 1.6.0)
-rmdir $(DESTDIR)$(local_lilypond_datadir)/dvips
-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 \
$(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