--- /usr/share/texmf/web2c/mktexnam	Mon Mar  5 00:05:41 2001
+++ mktexnam	Sun Mar  4 19:10:57 2001
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 # maketexnam -- find PK and TFM names.
 # te@informatik.uni-hannover.de, kb@mail.tug.org, and infovore@xs4all.nl.
 # Public domain.
@@ -146,9 +147,11 @@
     *$SEP$MT_DESTROOT$SEP*) # A system tree, check for varfonts.
       if test "x$USE_VARTEXFONTS" = x1 || test "x$USE_ALTERNATE" = x1; then
         MT_DESTROOT=$MT_VARTEXFONTS
-      fi ;;
+      fi
+      ;;
     *) # A non-system tree.
-      test "x$USE_ALTERNATE" = x1 && MT_DESTROOT=;;
+      test "x$USE_ALTERNATE" = x1 && MT_DESTROOT=
+      ;;
   esac
 fi
 
@@ -158,10 +161,15 @@
       MT_PKDESTDIR=$DEST
       MT_TFMDESTDIR=$DEST
       MT_MFDESTDIR=$DEST
-	MT_DESTROOT=foobar
-      MT_NAMEPART=;;
+
+      # make sure that the next IF (that overwrites MT_xxxDESTDIR) fails
+      MT_DESTROOT=foobar      
+      MT_NAMEPART=
+      ;;
+
    *) # Relative destdir => append to the default.
-      MT_NAMEPART=$DEST;;
+      MT_NAMEPART=$DEST
+      ;;
 esac
 
 if test -z "$MT_DESTROOT"; then