From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 21 Dec 2004 22:32:42 +0000 (+0000)
Subject: * python/lilylib.py (setup_environment): Remove cruft from
X-Git-Tag: release/2.5.14~370
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f4c76e28b257e03d671bd0a2c610286099e66ab9;p=lilypond.git

* python/lilylib.py (setup_environment): Remove cruft from
GS_FONTPATH.

* configure.in: Bump mftrace requirement to 1.1.1.
---

diff --git a/ChangeLog b/ChangeLog
index 94bc01e9ce..d5bff1b370 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-21  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* python/lilylib.py (setup_environment): Remove cruft from
+	GS_FONTPATH.
+
+	* configure.in: Bump mftrace requirement to 1.1.1.
+
 2004-12-20  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* scm/output-svg.scm (beam): Use polygon.
diff --git a/configure.in b/configure.in
index d9f0050f62..47e6f57139 100644
--- a/configure.in
+++ b/configure.in
@@ -52,7 +52,7 @@ STEPMAKE_MAKEINFO(REQUIRED)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
 # mftrace for generating pfa's, pfb's
-STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.0)
+STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.1)
 
 # mftrace for generating pfa's, pfb's
 STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20041208)
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 02522a3ca4..a2542a59ea 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -115,23 +115,22 @@ export MFINPUTS:=.:$(MFINPUTS)
 
 default: pfa_warning $(ALL_GEN_FILES) $(outdir)/bigcheese20.otf
 
-
 pfa_warning:
-ifneq ($(notdir $(MFTRACE)),mftrace)
-	@echo ""
-	@echo "ERROR: mftrace not found"
-	@echo ""
-	@echo "For obtaining PFA fonts, either install mftrace "
-	@echo "(see http://www.xs4all.nl/~hanwen/mftrace/ ),"
-	@echo "or try one of the following commands in this directory: "
-	@echo ""
-	@echo " make get-pfa "
-	@echo " make get-rpm-pfa "
-	@echo " make get-deb-pfa "
-	@echo ""
-	@echo "These commands will try to download the files from the internet."
-	@false
-endif
+# ifneq ($(notdir $(MFTRACE)),mftrace)
+# 	@echo ""
+# 	@echo "ERROR: mftrace not found"
+# 	@echo ""
+# 	@echo "For obtaining PFA fonts, either install mftrace "
+# 	@echo "(see http://www.xs4all.nl/~hanwen/mftrace/ ),"
+# 	@echo "or try one of the following commands in this directory: "
+# 	@echo ""
+# 	@echo " make get-pfa "
+# 	@echo " make get-rpm-pfa "
+# 	@echo " make get-deb-pfa "
+# 	@echo ""
+# 	@echo "These commands will try to download the files from the internet."
+# 	@false
+# endif
 
 
 debian-mirror=http://ftp.us.debian.org
diff --git a/python/lilylib.py b/python/lilylib.py
index 04efae76b1..da2c8947de 100644
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -421,7 +421,10 @@ def setup_environment ():
 		#         and thus may break tex run?
 		
 		'TEXMF' : "{%s,%s}" % (datadir, texmf) ,
-		'GS_FONTPATH' : type1_paths,
+		
+		# FIXME: check if these can be fully reset.
+		#'GS_FONTPATH' : "", #type1_paths,
+		'GS_FONTPATH' : datadir + '/fonts/type1',
 		'GS_LIB' : datadir + '/ps',
 		}