--- Make/makedefs	2006-07-27 22:25:33.000000000 +0200
+++ Make/makedefs	2006-07-27 22:38:12.000000000 +0200
@@ -76,8 +76,8 @@
 ##                            doesn't make a distinction, we will.
 ############################################################################
 
-CXXFLAGS   = $(ARCHARGS) $(DOF) $(DEF) $(INC)
-LDFLAGS    = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) 
+CXXFLAGS   += $(ARCHARGS) $(DEF) $(INC)
+LDFLAGS    += $(ARCHARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) $(LINKARGS) 
 OBJS       = $(C++FILES:.cpp=.o) \
              $(CXXFILES:.cpp=.o) \
              $(CFILES:.c=.o) \
@@ -355,9 +355,7 @@
     endif
   else
 
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.0
-endif
+    LDFLAGS         += -Wl,-soname -Wl,$@
 
 #    LDFLAGS         += `getconf LFS_LDFLAGS`
 #    DEF             += `getconf LFS_CFLAGS`
@@ -381,15 +379,15 @@
 
   SHARED            = -shared
   ifeq ($(SYSARCH),x86_64)
-    LINKARGS          = -L/usr/X11R6/lib64
+    LINKARGS          = -L/usr/lib64
   else
-    LINKARGS          = -L/usr/X11R6/lib
+    LINKARGS          = -L/usr/lib
   endif
   DYNAMICLIBRARYLIB = -ldl
   OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
   GL_LIBS           = -lGLU -lGL 
   GLUT_LIBS         = -lglut
-  X_INC             = -I/usr/X11R6/include
+  X_INC             = -I/usr/include
   X_LIBS            = -lXi -lXmu -lX11
   PF_XTRA_LIBS      = -L/usr/lib/libpfdb   -Xlinker -rpath /usr/lib/libpfdb \
                       -lpfdu -lpfutil -lpf 
@@ -398,7 +396,7 @@
   PNG_LIBS          = -lpng
   JPEG_LIBS         = -ljpeg
   TIFF_LIB          = -ltiff
-  GIF_LIBS          = -lungif
+  GIF_LIBS          = -lgif
   MAKEDIST          = $(TOPDIR)/Make/makerpms
 
   ifeq ("$(PROFILER)","gprof")