From b3979fa64731232dd62144fda1ff0a0941bf3aba Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Tue, 7 May 2002 02:51:33 +0000 Subject: [PATCH] Fixed rpath nonsense in makedefs for Irix --- Make/makedefs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Make/makedefs b/Make/makedefs index faeee1ee8..4a1369973 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -117,7 +117,7 @@ ifeq ($(OS),IRIX) C++ = CC DEPFLAGS = -M - INC += -I/usr/local/include + INC += -I${TOPDIR}/include DEF += -LANG:std -OPT:Olimit=0 \ -DEBUG:woff=1682 -DEBUG:woff=3303\ -MDupdate $(MAKEDEPEND) @@ -130,10 +130,10 @@ ifeq ($(ARCH),64) else ARCHARGS = -n32 endif - LINKARGS = -L${TOPDIR}/lib -LANG:std -OPT:Olimit=0 -L/usr/local/lib32 -rpath /usr/local/lib32 -rpath $(INST_LIBS) + LINKARGS = -L${TOPDIR}/lib -LANG:std -OPT:Olimit=0 DYNAMICLIBRARYLIB = -ldl OSG_LIBS = -losgGLUT -losgDB -losgUtil -losg - FREETYPE_LIB = -lfreetype + FREETYPE_LIB = -L/usr/freeware/lib32 -lfreetype GLUT_LIB = -lglut GL_LIBS = -lGLU -lGL X_LIBS = -lXext -lXi -lXmu -lX11