From 0dca2577a4539483fa8077bf050853c133584035 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 9 Feb 2005 16:23:09 +0000
Subject: [PATCH] Remove bashism.

---
 buildscripts/builder.py               | 2 +-
 cygwin/mknetrel                       | 2 +-
 stepmake/stepmake/metafont-rules.make | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/buildscripts/builder.py b/buildscripts/builder.py
index dd000e78b9..71c983ed84 100644
--- a/buildscripts/builder.py
+++ b/buildscripts/builder.py
@@ -211,7 +211,7 @@ def add_enc_src (target, source, env):
 a = 'cd ${TARGET.dir} && \
 if test -e ${SOURCE.filebase}.enc; then encoding="--encoding=${SOURCE.filebase}.enc"; fi; \
 MFINPUTS=$srcdir/mf:.: \
-mftrace --pfa --simplify --keep-trying $$encoding $TOO__verbose \
+mftrace --formats=pfa --simplify --keep-trying $$encoding $TOO__verbose \
 --include=${TARGET.dir} \
 ${SOURCE.file}'
 
diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index e8b8253190..826f27ee87 100644
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -141,7 +141,7 @@ prebuild () {
     # set LDFLAGS to find the python library
     # EXTRABUILDARGS="LDFLAGS=$cygwin_root/usr/bin/libpython2.3.dll"
 
-    addmakeflags LDFLAGS="$cygwin_root/usr/bin/libpython2.3.dll" ' ' "target=i686-pc-cygwin" ' '
+    addmakeflags LDFLAGS="$cygwin_root/usr/bin/libpython2.4.dll" ' ' "target=i686-pc-cygwin" ' '
 
     if iscygwin; then
 	# EXTRABUILDARGS="$EXTRABUILDARGS all doc web"
diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index e62a94dd89..7d73580266 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -29,9 +29,10 @@ $(outdir)/%.$(XPM_RESOLUTION)pk: $(outdir)/%.$(XPM_RESOLUTION)gf
 	gftopk $< $@
 
 
+MFTRACE_FORMATS = pfa pfb svg
 $(outdir)/%.pfb $(outdir)/%.svg $(outdir)/%.pfa: %.mf
 	$(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --formats=pfa,pfb,svg $(basename $(@F))
-	mv $(basename $(@F)).{pfa,pfb,svg} $(outdir)
+	-mv $(MFTRACE_FORMATS:%=$(basename $(@F).%)) $(outdir)
 
 #%.afm:
 #	$(SHELL) $(depth)/buildscripts/tfmtoafm.sh $(shell basename $@ .afm)
-- 
2.39.5