--- Make/makedefs	2006-07-27 21:50:57.000000000 +0200
+++ Make/makedefs	2006-07-27 21:59:22.000000000 +0200
@@ -57,8 +57,8 @@
 
 INC        = -I$(TOPDIR)/include 
 
-CXXFLAGS   = $(ARCHARGS) $(DOF) $(DEF) $(INC)
-LDFLAGS    = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) 
+CXXFLAGS   += $(ARCHARGS) $(DEF) $(INC)
+LDFLAGS    += $(ARCHARGS) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) 
 OBJS       = $(CXXFILES:.cpp=.o) \
 	     	 $(CFILES:.c=.o) \
 	     	 $(YACCFILES:.y=.o) \
@@ -86,7 +86,7 @@
 INSTLINKCMD        = $(LINK)
 
 LIB_PREFIX         = lib
-LIB_EXT            = so
+LIB_EXT            = so.$(VERSION_MAJOR)
 EXE_EXT    =
 
 MAKEDIST           = echo "   === Distribution build is not implemented yet for $(OS)"; printf "\n"
@@ -249,9 +249,7 @@
       CXX               = g++
     endif
 
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).0
-endif
+    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT)
 
     DEF               += -fPIC -pthread
     OPTF              = -O2
@@ -272,9 +270,9 @@
   SHARED            = -shared
   ARCHARGS          = 
 ifeq ($(SYSARCH),x86_64)
-  LINKARGS          = -L/usr/X11R6/lib64
+  LINKARGS          = -L/usr/lib64
 else
-  LINKARGS          = -L/usr/X11R6/lib
+  LINKARGS          = -L/usr/lib
 endif
   MAKEDIST          = $(TOPDIR)/Make/makerpms