r416: better message

[debhelper.git] / dh_installxfonts

diff --git a/dh_installxfonts b/dh_installxfonts
index e1a46aab3493ca7c47a0983f327e139eb2b06eb1..83f38c0ae2e5767d4c48be9926ece8de4a04bb4e 100755 (executable)
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -2,16 +2,16 @@
 #
 # Integration with the Debian X11 font policy.
 
-BEGIN { push @INC, "debian", "/usr/share/debhelper" }
-use Dh_Lib;
+use Debian::Debhelper::Dh_Lib;
 init();
 
 foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
        $TMP=tmpdir($PACKAGE);
+       my $XFONTDIR="$TMP/usr/X11R6/lib/X11/fonts/";
 
        # Find all fint directories in the package build directory.
-       opendir DIR, "$TMP/usr/X11R6/lib/X11/fonts/" || next;
-       my @fontdirs = grep { -d $_ && !/^\./ } (readdir DIR);
+       opendir DIR, $XFONTDIR || next;
+       my @fontdirs = grep { -d "$XFONTDIR/$_" && !/^\./ } (readdir DIR);
        closedir DIR;
 
        if (@fontdirs) {