--- ray/makeall	2005/09/21 17:17:23	1.21
+++ ray/makeall	2008/04/17 14:58:57	1.23
@@ -1,5 +1,5 @@
 #!/bin/csh -f
-# RCSid $Id: makeall,v 1.21 2005/09/21 17:17:23 greg Exp $
+# RCSid $Id: makeall,v 1.23 2008/04/17 14:58:57 greg Exp $
 # 
 # Make all the Radiance programs
 #
@@ -163,7 +163,7 @@ case 5:			# BSDI BSD/386
 	set compat="erf.o strcmp.o"
 	breaksw
 case 6:			# Linux
-	set mach="-Dlinux -D_FILE_OFFSET_BITS=64 -Dfseeko=fseek -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO"
+	set mach="-Dlinux -D_FILE_OFFSET_BITS=64 -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO"
 	set opt="-O2"
 	set arch=IBMPC
 	set compat="erf.o"
@@ -171,6 +171,8 @@ case 6:			# Linux
 	breaksw
 case 7:			# MacOS X
 	set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
+	# Ugly fix for Leopard OpenGL link bug:
+	if (`uname -r` =~ 9.*) set mach="$mach -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
 	set opt="-O2"
 	set arch=PowerPC
 	set extras="CC=cc CONFIGURE_ARCH=powerpc"