- push @updatecmds, '/usr/sbin/update-fonts-alias'
- if -f "$tmp/etc/X11/fonts/$f/$package.alias";
- # This must come _before_ mkfontdir, thus the unshift.
- unshift @updatecmds, '/usr/sbin/update-fonts-scale'
- if -f "$tmp/etc/X11/fonts/$f/$package.scale";
+ # This must come before update-fonts-dir.
+ push @cmds, "update-fonts-scale --x11r7-layout $f"
+ if -f "$tmp/etc/X11/fonts/X11R7/$f/$package.scale";
+ push @cmds, "update-fonts-dir --x11r7-layout $f";
+ push @cmds, "update-fonts-alias --x11r7-layout $f"
+ if -f "$tmp/etc/X11/fonts/X11R7/$f/$package.alias";