--- ./Makefile.linux.gege	2002-10-15 05:30:18.000000000 +0200
+++ ./Makefile.linux	2003-02-03 15:31:23.000000000 +0100
@@ -3,6 +3,7 @@
 use strict;
 use ExtUtils::MakeMaker;
 use Getopt::Long;
+use MDK::Common;
 
 #
 # Configure SDL proper
@@ -14,10 +15,11 @@
 # Configuration detection of Linux / Unix
 #
 
+my $lib = arch() =~ /x86_64|sparc64/ ? "lib64" : "lib";
 $sdl_cflags = `sdl-config --cflags`;
 chomp($sdl_cflags);
-$sdl_libs = "-L/usr/X11R6/lib " . `sdl-config --libs`;
-$sdl_libs =~ s/-Wl,-rpath,\S*lib//; # suppress the insanity
+$sdl_libs = "-L/usr/X11R6/$lib " . `sdl-config --libs`;
+$sdl_libs =~ s/-Wl,-rpath,\S*$lib//; # suppress the insanity
 
 #
 # Search paths
@@ -25,10 +27,8 @@
 
 @dirs=(
 	'/usr/local/include/SDL', 
-	'/usr/local/include',
 	'/usr/local/include/smpeg',
 	'/usr/include/SDL',
-	'/usr/include',
 	'/usr/include/smpeg',
 	'/usr/local/include/GL',
 	'/usr/local/include/gl',
@@ -36,6 +36,8 @@
 	'/usr/include/gl', 
 );
 
+my @extradirs = qw(/usr/include /usr/X11R6/include);
+
 $inc_flags = "-ggdb " . $ENV{DEBUG};
 
 #
@@ -62,7 +64,7 @@
 
 my ($e,$d);
 for $e ( keys %ext ) {
-	for $d (@dirs) {
+	for $d (@dirs, @extradirs) {
 		$ext{$e}{exists} ||= -e "$d/$ext{$e}{test}" 
 	}
 }