Changeset 7759

Timestamp:

10/28/05 19:24:02 (3 years ago)

Author:

rafl

Message:

r18815@ata: rafl | 2005-10-28 19:24:35 +0200

• Make pugs detection a bit more portable.
• Embed parrot in the debian package as default.

Files:

• Makefile.PL (modified) (3 diffs)
• debian/rules (modified) (1 diff)

Makefile.PL

@@ -248 +248 @@
     if ($ENV{PUGS_EMBED} and $ENV{PUGS_EMBED} =~ /\bparrot\b/i) {
         my $base = $ENV{PARROT_PATH};
-                chomp(my $parrot_config = `which parrot-config.imc 2>/dev/null`);
+                my $parrot_config;
+                for my $item (split(/:/, $ENV{PATH})) {
+                        my $path = File::Spec->catfile($item, 'parrot-config.imc');
+                        $parrot_config = $path, last if -e $path;
+                }
                 if (!$base && -e $parrot_config) {
                         $base = (File::Spec->splitpath($parrot_config))[1];
@@ -263 +267 @@
         my $libs = parrot_config($base, 'libs');
         my $icuflags = parrot_config($base, 'icu_shared');
+                my $include_path = parrot_config($base, 'prefix') . parrot_config($base, 'inc');
 
         # strip non-GHC flags
@@ -268 +273 @@
         $libs =~ s/-[^IlL]\S*//g;
         $icuflags =~ s/-[^IlL]\S*//g;
-
-        $embed_flags .= " -I$base/include -L$base/blib/lib -DPUGS_HAVE_PARROT -L$base/blib/lib -L/usr/local/lib $ldflags ";
+        $include_path =~ s/-[^IlL]\S*//g;
+
+        $embed_flags .= " -I$include_path -I$base/include -L$base/blib/lib -DPUGS_HAVE_PARROT -L$base/blib/lib -L/usr/local/lib $ldflags ";
         $ghc_output .= " -lparrot $libs $icuflags ";
         my $config = "$base/src/parrot_config$Config{_o}";

debian/rules

@@ -16 +16 @@
 configure-stamp: patch-stamp
         dh_testdir
-        PUGS_EMBED=perl5 perl Makefile.PL INSTALLDIRS=vendor DESTDIR=/usr/lib/haskell-packages/ghc6/
+        PUGS_EMBED=perl5,parrot perl Makefile.PL INSTALLDIRS=vendor DESTDIR=/usr/lib/haskell-packages/ghc6/
         touch configure-stamp