--- Make/instrules
+++ Make/instrules
@@ -28,7 +28,7 @@
 
 __inst_headers:
 	@[ -d $(INST_INCLUDE)/OpenThreads ] || mkdir -p $(INST_INCLUDE)/OpenThreads
-	for f in include/OpenThreads/* ; do\
+	for f in include/OpenThreads/* ; do \
 	if [ ! -d $$f ];\
 	then\
 		[ "`head -1 $$f | cut -c 1-12`" = "/* -*-c++-*-"  ] && \
@@ -39,10 +39,10 @@
 
 
 __inst_share:
-	@for d in `find share/ -type d -print | grep -v CVS`; do\
+	@for d in `find share/ -type d -print | grep -v CVS`; do \
         [ -d $(INST_LOCATION)/$$d ] || mkdir -p $(INST_LOCATION)/$$d;\
         done
-	@for f in `find share/ -type f -print | grep -v CVS`; do\
+	@for f in `find share/ -type f -print | grep -v CVS`; do \
         $(INSTRCMD) $$f $(INST_LOCATION)/$$f;\
         done
 
--- Make/makedefs
+++ Make/makedefs
@@ -68,8 +68,8 @@
 
 INC        = -I$(TOPDIR)/include 
 
-CXXFLAGS   = $(ARCHARGS) $(DOF) $(DEF) $(INC)
-LDFLAGS    = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) 
+CXXFLAGS   += -Wall $(ARCHARGS) $(DEF) $(INC)
+LDFLAGS    += $(ARCHARGS) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) 
 OBJS       = $(CXXFILES:.cpp=.o) \
 	     $(C++FILES:.c++=.o) \
 	     	 $(CFILES:.c=.o) \
@@ -100,7 +100,7 @@
 INSTLINKCMD        = $(LINK)
 
 LIB_PREFIX         = lib
-LIB_EXT            = so
+LIB_EXT            = so.$(VERSION_MAJOR)
 
 MAKEDIST           = echo "   === Distribution build is not implemented yet for $(OS)"; printf "\n"
 INSTLOGFILE        = /tmp/.openThreads_inst_log
@@ -227,9 +227,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
     OPTF              = -O2

--- Make/makerules
+++ Make/makerules
@@ -139,7 +139,7 @@
 	else\
 	    depfiles="$?";\
 	fi;\
-	if [ ! -z "$$depfiles" ]; then\
+	if [ ! -z "$$depfiles" ]; then \
 	for f in $$depfiles; do \
 	    echo "$(CXX) $(DEPARG) $(INC) $$f  pipeto .depend/`basename $$f`"; \
 	    $(CXX) $(DEPARG) $(INC) $$f > .depend/`basename $$f`; \