Merge -r 593742:593743 from trunk to branch-0.15 to fix HADOOP-2169

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/branches/branch-0.15@593747 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -8,6 +8,10 @@ Release 0.15.1 -
     HADOOP-2140.  Add missing Apache Licensing text at the front of several
     C and C++ files.
 
+    HADOOP-2169.  Fix the DT_SONAME field of libhdfs.so to set it to the
+    correct value of 'libhdfs.so', currently it is set to the absolute path of
+    libhdfs.so. (acmurthy) 
+
 Release 0.15.0 - 2007-11-2
 
   INCOMPATIBLE CHANGES

src/c++/libhdfs/Makefile

@@ -31,8 +31,9 @@ PLATFORM = $(shell echo $$OS_NAME | tr [A-Z] [a-z])
 CPPFLAGS = -m32 -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(PLATFORM)
 
 LIB_NAME = hdfs
-SO_TARGET = $(LIBHDFS_BUILD_DIR)/lib$(LIB_NAME).so.$(SHLIB_VERSION)
-SO = $(LIBHDFS_BUILD_DIR)/lib$(LIB_NAME).so
+SO_NAME = lib$(LIB_NAME).so
+SO_TARGET = $(LIBHDFS_BUILD_DIR)/$(SO_NAME).$(SHLIB_VERSION)
+SO = $(LIBHDFS_BUILD_DIR)/$(SO_NAME)
 
 RM = rm -rf
 LINK = ln -sf
@@ -52,7 +53,7 @@ HDFS_WRITE_TEST = $(LIBHDFS_BUILD_DIR)/hdfs_write
 all: $(SO_TARGET) $(HDFS_TEST) $(HDFS_READ_TEST) $(HDFS_WRITE_TEST)
 
 $(SO_TARGET): $(COBJS)
-	$(LD) $(LDFLAGS) -o $(SO_TARGET) -Wl,-soname,$(SO_TARGET) $(COBJS) \
+	$(LD) $(LDFLAGS) -o $(SO_TARGET) -Wl,-soname,$(SO_NAME) $(COBJS) \
 	&& $(LINK) $(SO_TARGET) $(SO)
 	
 $(LIBHDFS_BUILD_DIR)/%.o: %.c