From 88a62173d2b503b41b4871510a2de0286415e274 Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Tue, 2 Jul 2002 15:01:46 +0000 Subject: [PATCH] -n32 and -64 entries were reversed in makedefs --- Make/instrules | 17 +++++++++-------- Make/makedefs | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Make/instrules b/Make/instrules index 8c0f0e269..ee6ce6d0e 100644 --- a/Make/instrules +++ b/Make/instrules @@ -131,20 +131,21 @@ __install : if [ -f $$f ] ; \ then \ INSTPATH=$$THISDIR/$$f; \ - while [ -L $$INSTPATH ]; \ - do \ - ll=`ls -l $$INSTPATH | cut -f2 -d">"`;\ - echo cd `dirname $$ll`;\ - cd `dirname $$ll`;\ - INSTPATH="`pwd`"/"`basename $$ll`";\ - cd $$THISDIR;\ - done;\ echo $(INSTALL) $$INSTPATH $(INSTDEST)/$$f;\ $(INSTALL) $$INSTPATH $(INSTDEST)/$$f;\ fi\ done\ fi +# while [ -L $$INSTPATH ]; \ + +# while `csh -f -c "test -L $$INSTPATH"` ;\ +# do \ +# ll=`ls -l $$INSTPATH | cut -f2 -d">"`;\ +# cd `dirname $$ll`;\ +# INSTPATH="`pwd`"/"`basename $$ll`";\ +# cd $$THISDIR;\ +# done;\ __instclean : diff --git a/Make/makedefs b/Make/makedefs index 0c74a53dd..59e2fe78a 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -132,7 +132,7 @@ ifeq ($(OS),IRIX) ARCH = 32 ifeq ($(ARCH),64) ARCHARGS = -64 - FREETYPE_LIB = -L/usr/freeware/lib32 -lfreetype + FREETYPE_LIB = -L/usr/freeware/lib64 -lfreetype PF_XTRA_LIBS = -L/usr/lib64/libpfdb -rpath /usr/lib64/libpfdb \ -lpf3ds -lpfdem -lpfdted -lpfdwb -lpfdxf -lpfevt \ -lpfflt -lpfgds -lpfgfo -lpfim -lpflsa -lpflsb \ @@ -141,7 +141,7 @@ ifeq ($(ARCH),64) -lpftri -lpfunc -lpfvct -lpfdu -lpfutil -lpf -limage else ARCHARGS = -n32 - FREETYPE_LIB = -L/usr/freeware/lib64 -lfreetype + FREETYPE_LIB = -L/usr/freeware/lib32 -lfreetype PF_XTRA_LIBS = -L/usr/lib32/libpfdb -rpath /usr/lib32/libpfdb \ -lpf3ds -lpfdem -lpfdted -lpfdwb -lpfdxf -lpfevt \ -lpfflt -lpfgds -lpfgfo -lpfim -lpflsa -lpflsb \