Changeset 7449 for inc

Timestamp:

10/08/05 21:39:07 (3 years ago)

Author:

autrijus

Message:

* xinming++ for pointing out that for nonstand GHC locations,

our ./Setup configure did not catch any them up. This should
fix it for real.

Files:

• inc/Module/Install/Pugs.pm (modified) (2 diffs)

inc/Module/Install/Pugs.pm

@@ -176 +176 @@
     }
     chomp $ghc_flags;
-    return ($ghc, $ghc_version, $ghc_flags);
+
+    return ($ghc, $ghc_version, $ghc_flags, $self->assert_ghc_pkg);
 }
 
 sub has_ghc_package {
     my ($self, $package) = @_;
+    my $ghc_pkg = $self->assert_ghc_pkg;
+    `$ghc_pkg describe $package` =~ /package-url/;
+}
+
+sub assert_ghc_pkg {
+    my $self = shift;
     my $ghc_pkg = $ENV{GHC_PKG};
 
@@ -190 +197 @@
     }
 
-    `$ghc_pkg describe $package` =~ /package-url/;
-}
+    die "*** Cannot find ghc-pkg; please set it in your GHC_PKG environment variable.\n"
+        unless $ghc_pkg;
+
+    return $ghc_pkg;
+}
+
 
 sub fixpaths {