From 9331893d5840726c572c5f3e1cb6be56a685d11c Mon Sep 17 00:00:00 2001
From: Erlend Aasland <erlenda@gmail.com>
Date: Mon, 10 Apr 2006 13:22:19 +0000
Subject: [PATCH] * mf/GNUmakefile: remove redundant mftrace check. Also remove
 get-pfa and get-*-fonts targets.

---
 ChangeLog      |  5 +++++
 mf/GNUmakefile | 37 +------------------------------------
 2 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7bf3c1eae4..5ba0c92eea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-10  Erlend Aasland  <erlenda@gmail.com>
+
+	* mf/GNUmakefile: remove redundant mftrace check. Also remove
+	get-pfa and get-*-fonts targets.
+
 2006-04-10  Graham Percival  <gpermus@gmail.com>
 
 	* THANKS, Documentation/user/ basic-notation, advanced-notation,
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 872b5a83f7..961a74383a 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -129,7 +129,7 @@ export MFINPUTS:=.:$(MFINPUTS)
 
 
 
-default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen
+default: $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen
 
 .PHONY: tree-regen
 
@@ -137,50 +137,15 @@ default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen
 tree-regen:
 	${MAKE} -C $(top-build-dir) link-mf-tree
 
-pfa_warning:
-ifneq ($(shell $(MFTRACE) --version | head -n 1 | sed 's/ .*//'),mftrace)
-	@echo ""
-	@echo "ERROR: mftrace not found"
-	@echo ""
-	@echo "For obtaining PFA/SVG 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-fonts "
-	@echo " make get-rpm-fonts "
-	@echo " make get-deb-fonts "
-	@echo ""
-	@echo "These commands will try to download the files from internet."
-	@false
-endif
-
-
 debian-mirror=http://ftp.us.debian.org
 debian-package =lilypond_$(TOPLEVEL_VERSION)-1_i386.deb
 $(outdir)/$(debian-package):
 	wget --passive-ftp -P $(outdir) $(debian-mirror)/debian/pool/main/l/lilypond/$(debian-package)
 
-get-deb-fonts: $(outdir)/$(debian-package)
-	rm -rf $(outdir)/./usr
-	ar p $< data.tar.gz | \
-		tar -C $(outdir) -zvxf - '*.pfa' '*.svg'
-	cp `find $(outdir)/usr/ -name '*.pfa' -o -name '*.svg'` $(outdir)/
-
-
 redhat-package=lilypond-$(TOPLEVEL_VERSION)-1.i386.rpm
 $(outdir)/$(redhat-package):
 	wget  --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/Fedora-4/$(redhat-package)
 
-get-rpm-fonts: $(outdir)/$(redhat-package)
-	cd $(outdir) ; rm -rf usr/ # (root alert!)
-	cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -uid '*.pfa' '*.svg'
-	cp `find $(outdir)/usr/ -name '*.pfa' -o -name '*.svg'` $(outdir)/
-
-# change this dependency
-get-fonts: get-rpm-fonts
-get-pfa: get-rpm-fonts
-
-
 ##
 ## todo: this also depends on .tfm, FIXME.
 $(outdir)/%.lisp $(outdir)/%.otf-gtable $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm
-- 
2.39.2