--- libPARI/Makefile.PL.orig	2009-11-06 19:21:40.000000000 -0800
+++ libPARI/Makefile.PL	2010-07-12 16:54:09.000000000 -0700
@@ -120,7 +120,7 @@
   if ($Config{osname} eq 'os2' and not $extra_inc =~ /os2(?!\S)/) {
     # 2.1.3 does not include dlctl.h
     $mycflags .= ' -DRTLD_LAZY=0 -DRTLD_GLOBAL=0';
-    $inc .= ' -I $(PERL_INC)';
+    $inc .= ' -I$(PERL_INC)';
   }
 } elsif ($machine eq 'hppa') {
   $mycflags="-Aa -DHPPA";	#$mycflags="-O -Aa -DHPPA";
@@ -216,7 +216,7 @@
 		    CFG_CCCDLFLAGS => $Config{cccdlflags},
 		   },
     DEFINE	=> $mycflags,
-    INC		=> $extra_inc . ' -I $(PARI_DIR)/src/headers -I $(PARI_DIR)/src/graph -I .'
+    INC		=> $extra_inc . ' -I$(PARI_DIR)/src/headers -I$(PARI_DIR)/src/graph -I.'
 			. $inc,
     C		=> \@cfiles,
     SKIP	=> [qw( distclean test dist makeaperl xs_o static)],
@@ -237,10 +237,10 @@
   my $inlines = $inlines2[1];
   $converted = <<EOC if $kernel{convert};
 $kernel{converted1}: $kernel{file1} $kernel{header1}
-	\$(CPP) -I . \$(INC) -I $kernel{dir1} \$(DEFINE) \$(ASSCPPDEFINE) $kernel{file1} | perl -ne "s/%\\s+/%/g; print unless /^\\s*#/" > \$@
+	\$(CPP) -I. \$(INC) -I$kernel{dir1} \$(DEFINE) \$(ASSCPPDEFINE) $kernel{file1} | perl -ne "s/%\\s+/%/g; s/##//g; print unless /^#/" > \$@
 
 kernel2.s: $kernel{file2}
-	\$(CPP) -I . \$(INC) -I $kernel{dir1} \$(DEFINE) \$(ASSCPPDEFINE) $kernel{file2} | perl -ne "s/%\\s+/%/g; print unless /^\\s*#/" > \$@
+	\$(CPP) -I. \$(INC) -I$kernel{dir1} \$(DEFINE) \$(ASSCPPDEFINE) $kernel{file2} | perl -ne "s/%\\s+/%/g; s/##//g; print unless /^#/" > \$@
 
 EOC
   my $create_mp = '';
