diff --git a/Makefile.PL b/Makefile.PL
index d32205d..3e8fa0a 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -124,14 +124,7 @@ if ($IS_MINGW)
 # Look for available libs
 our @libdirs = qw
 {
-  -L/usr/lib
-  -L/usr/lib/i386-linux-gnu
-  -L/usr/X11R6/lib
-  -L/opt/X11/lib
-  -L/usr/local/lib
-  -L/usr/openwin/lib
-  -L/opt/csw/lib
-  -L/usr/local/freeglut/lib
+@@libdirs@@
 };

 our @check_libs = qw
@@ -804,7 +797,6 @@ sub get_extensions
   my $exc_file = 'gl_exclude.h';
   unlink($exc_file) if (-e $exc_file);
   my $glv_file = 'utils/glversion.txt';
-  unlink($glv_file) if (-e $glv_file);

   # Only run the rest if GLUT is installed
   print "Testing GLUT version\n" if ($verbose);
@@ -861,7 +853,7 @@ sub get_extensions
     $make_ver = ";make -f Makefile " .  (length($lib) ? "GLUT_LIB=$lib " : "") . (length($def) ? "GLUT_DEF=$def " : "");
     print "glversion: '$make_ver'\n" if $verbose>1;
   }
-  my $exec = 'cd utils'."$make_ver clean".$make_ver;
+  my $exec = 'cd utils'.$make_ver;
   print "glversion: $exec\n" if ($verbose);
   my $stat = `$exec`;
   print "\n$stat\n\n" if ($verbose);