--- make/ivcommondefs.orig	2003-07-11 22:40:54 UTC
+++ make/ivcommondefs
@@ -131,9 +131,9 @@ endif
 # Determine optimization from LIBTYPE.
 #
 
-OPTIMIZER = -O -DNDEBUG
+OPTIMIZER = -DNDEBUG
 ifneq (, $(findstring debug, $(LIBTYPE)))
-OPTIMIZER = -g
+OPTIMIZER = -DDEBUG
 endif
 
 
@@ -206,12 +206,6 @@ IVDEMODATADIR = $(IVDEMODIR)/data/Invent
 # Locate installed Inventor libraries when linking applications.
 #
 
-ifneq (, $(findstring debug, $(LIBTYPE)))
-LLDDSOOPTS += -L$(IVDLIBDIR)
-LLDOPTS += -L$(IVDLIBDIR)
-CXXDSOOPTS += -L$(IVDLIBDIR)
-else
-LLDDSOOPTS += -L$(IVLIBDIR)
-LLDOPTS += -L$(IVLIBDIR)
-CXXDSOOPTS += -L$(IVLIBDIR)
-endif
+LLDDSOOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt
+LLDOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt
+CXXDSOOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt