Ticket #21155: patch-ARB-makefile.diff

Makefile

@@ -202 +202 @@
 XINCLUDES:=-I$(XHOME)/include
 
 ifdef DARWIN
-        XINCLUDES := -I/sw/include -I$(OSX_SDK)/usr/X11/include -I$(OSX_SDK)/usr/include/krb5 -I/usr/OpenMotif/include #Snow Leopard couldn't find OpenMotif
+        XINCLUDES := -I$(OSX_FW)/OpenGL.framework/Headers -I$(OSX_SDK)/usr/X11/include -I$(OSX_SDK)/usr/include/krb5 -I$(OSX_FW)/GLUT.framework/Headers -I$(PREFIX)/include
 endif
 
 ifdef DARWIN
-        XLIBS := -L/usr/OpenMotif/lib -lXm -L$(XHOME)/lib -lpng -lXt -lX11 -lXext -lXp -lc -lXmu -lXi
+        XLIBS := -L$(PREFIX)/lib -lXm -L$(XHOME)/lib -lpng -lXt -lX11 -lXext -lXp -lc -lXmu -lXi
         XLIBS += -lGLU -lGL -Wl,-dylib_file,$(OSX_FW_OPENGL)/libGL.dylib:$(OSX_FW_OPENGL)/libGL.dylib
 else
         XLIBS:=-L$(XHOME)/$(CROSS_LIB) -lXm -lXpm -lXp -lXt -lXext -lX11
@@ -225 +225 @@
 
 GL_PNGLIBS := -L$(ARBHOME)/GL/glpng -lglpng_arb -lpng
 
- ifdef DARWIN
-        GLEWLIB := -L/usr/lib -lGLEW -L$(OSX_SDK)/usr/X11/lib -lGLw
-        GLUTLIB := -L$(XHOME)/lib -lglut
- else 
-        GLEWLIB := -lGLEW -lGLw
-        GLUTLIB := -lglut
- endif
-
+GLEWLIB := -lGLEW -lGLw
+GLUTLIB := -lglut
+ 
 GL_LIBS := $(GL_LIB) $(GLEWLIB) $(GLUTLIB) $(GL_PNGLIBS)
 
 #XLIBS += $(GL_LIB)
@@ -247 +242 @@
 
 #---------------------- tiff lib:
 
-ifdef DARWIN
-        TIFFLIBS := -L/usr/local/lib -ltiff -L$(OSX_FW_IMAGEIO) -lTIFF  
-else
-        TIFFLIBS := -ltiff
-endif
+TIFFLIBS := -ltiff
 
 #---------------------- basic libs:
 
@@ -318 +309 @@
 
 CTAGS := etags
 ifdef DARWIN
-        XMKMF := /usr/X11/bin/xmkmf
+        XMKMF := $(PREFIX)/bin/xmkmf
 else
         XMKMF := /usr/bin/X11/xmkmf
 endif