Fix build system auto-selection breakage.

[debhelper.git] / dh_installxfonts

diff --git a/dh_installxfonts b/dh_installxfonts
index 92379885a03bc53d4be57d22ab241aafcfff26eb..276f903c0240b4b17273f3687b9cd384c1270b69 100755 (executable)
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -22,7 +22,7 @@ and fonts.scale be rebuilt properly at install time.
 Before calling this program, you should have installed any X fonts provided
 by your package into the appropriate location in the package build
 directory, and if you have fonts.alias or fonts.scale files, you should
-install them into the correct location under etc/X11/fonts/X11R7 in your
+install them into the correct location under etc/X11/fonts in your
 package build directory.
 
 Your package should depend on xfonts-utils so that the
@@ -30,8 +30,9 @@ update-fonts-* commands are available. (This program adds that dependency to
 ${misc:Depends}.)
 
 This program automatically generates the postinst and postrm commands needed
-to register X fonts.  See L<dh_installdeb(1)> for an explanation of how this
-works.
+to register X fonts. These commands are inserted into the maintainer
+scripts by dh_installdeb. See L<dh_installdeb(1)> for an explanation of how
+this works.
 
 =head1 NOTES
 
@@ -51,7 +52,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        # Find all font directories in the package build directory.
        my @fontdirs;
        foreach my $parentdir ("$tmp/usr/X11R6/lib/X11/fonts/", "$tmp/usr/share/fonts/X11/") {
-               opendir DIR, $parentdir || next;
+               opendir(DIR, $parentdir) || next;
                @fontdirs = grep { -d "$parentdir/$_" && !/^\./ } (readdir DIR);
                closedir DIR;
        }
@@ -62,10 +63,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                my @cmds;
                foreach my $f (@fontdirs) {
                        # 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-scale $f"
+                               if -f "$tmp/etc/X11/fonts/$f/$package.scale";
                        push @cmds, "update-fonts-dir --x11r7-layout $f";
-                       push @cmds, "update-fonts-alias --x11r7-layout $f"
+                       push @cmds, "update-fonts-alias $f"
                                if -f "$tmp/etc/X11/fonts/$f/$package.alias";
                }