Remove bashism.

diff --git a/buildscripts/builder.py b/buildscripts/builder.py
index dd000e78b9b003d1effc6459764630155227dcee..71c983ed849aebb64bf68debc391f0edeaa7f0ce 100644 (file)
--- 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 e8b82531901216fbb4eaaff635e4f0ca474efcb9..826f27ee87c95f567870b2502a21e0c0542e9aec 100644 (file)
--- 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 e62a94dd899eb7b4f83816e7ece65fcbf282e6f1..7d735802660b039dcae1c15c04c121526d24fa28 100644 (file)
--- 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)