diff -Naur ACE_wrappers.orig/ace/ETCL/Makefile.in ACE_wrappers/ace/ETCL/Makefile.in
--- ACE_wrappers.orig/ace/ETCL/Makefile.in	2010-10-27 06:09:30.000000000 -0400
+++ ACE_wrappers/ace/ETCL/Makefile.in	2010-12-27 14:05:27.000000000 -0500
@@ -411,9 +411,9 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libACE_ETCL.la: $(libACE_ETCL_la_OBJECTS) $(libACE_ETCL_la_DEPENDENCIES) 
-	$(libACE_ETCL_la_LINK) -rpath $(libdir) $(libACE_ETCL_la_OBJECTS) $(libACE_ETCL_la_LIBADD) $(LIBS)
+	$(libACE_ETCL_la_LINK)  $(libACE_ETCL_la_OBJECTS) $(libACE_ETCL_la_LIBADD) $(LIBS)
 libACE_ETCL_Parser.la: $(libACE_ETCL_Parser_la_OBJECTS) $(libACE_ETCL_Parser_la_DEPENDENCIES) 
-	$(libACE_ETCL_Parser_la_LINK) -rpath $(libdir) $(libACE_ETCL_Parser_la_OBJECTS) $(libACE_ETCL_Parser_la_LIBADD) $(LIBS)
+	$(libACE_ETCL_Parser_la_LINK)  $(libACE_ETCL_Parser_la_OBJECTS) $(libACE_ETCL_Parser_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
diff -Naur ACE_wrappers.orig/ace/Makefile.in ACE_wrappers/ace/Makefile.in
--- ACE_wrappers.orig/ace/Makefile.in	2010-10-27 06:09:31.000000000 -0400
+++ ACE_wrappers/ace/Makefile.in	2010-12-27 14:06:23.000000000 -0500
@@ -1441,7 +1441,7 @@
 libACE_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(libACE_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ACE_FOR_TAO_FALSE@am_libACE_la_rpath = -rpath $(libdir)
+@BUILD_ACE_FOR_TAO_FALSE@am_libACE_la_rpath = 
 am__DEPENDENCIES_1 =
 @BUILD_FL_TRUE@@BUILD_GL_TRUE@@BUILD_X11_TRUE@libACE_FlReactor_la_DEPENDENCIES =  \
 @BUILD_FL_TRUE@@BUILD_GL_TRUE@@BUILD_X11_TRUE@	libACE.la \
@@ -1453,7 +1453,7 @@
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(libACE_FlReactor_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_FL_TRUE@@BUILD_GL_TRUE@@BUILD_X11_TRUE@am_libACE_FlReactor_la_rpath =  \
-@BUILD_FL_TRUE@@BUILD_GL_TRUE@@BUILD_X11_TRUE@	-rpath $(libdir)
+@BUILD_FL_TRUE@@BUILD_GL_TRUE@@BUILD_X11_TRUE@	
 @BUILD_QT_TRUE@libACE_QtReactor_la_DEPENDENCIES = libACE.la \
 @BUILD_QT_TRUE@	$(am__DEPENDENCIES_1)
 am__libACE_QtReactor_la_SOURCES_DIST = QtReactor/QtReactor.cpp \
@@ -1465,7 +1465,7 @@
 libACE_QtReactor_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(libACE_QtReactor_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_QT_TRUE@am_libACE_QtReactor_la_rpath = -rpath $(libdir)
+@BUILD_QT_TRUE@am_libACE_QtReactor_la_rpath = 
 @BUILD_TK_TRUE@libACE_TkReactor_la_DEPENDENCIES = libACE.la \
 @BUILD_TK_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__libACE_TkReactor_la_SOURCES_DIST = TkReactor/TkReactor.cpp
@@ -1475,7 +1475,7 @@
 libACE_TkReactor_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(libACE_TkReactor_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_TK_TRUE@am_libACE_TkReactor_la_rpath = -rpath $(libdir)
+@BUILD_TK_TRUE@am_libACE_TkReactor_la_rpath = 
 @BUILD_X11_TRUE@@BUILD_XT_TRUE@libACE_XtReactor_la_DEPENDENCIES =  \
 @BUILD_X11_TRUE@@BUILD_XT_TRUE@	libACE.la $(am__DEPENDENCIES_1) \
 @BUILD_X11_TRUE@@BUILD_XT_TRUE@	$(am__DEPENDENCIES_1)
@@ -1485,8 +1485,7 @@
 libACE_XtReactor_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(libACE_XtReactor_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_X11_TRUE@@BUILD_XT_TRUE@am_libACE_XtReactor_la_rpath = -rpath \
-@BUILD_X11_TRUE@@BUILD_XT_TRUE@	$(libdir)
+@BUILD_X11_TRUE@@BUILD_XT_TRUE@am_libACE_XtReactor_la_rpath =
 DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/aux_config/depcomp
 am__depfiles_maybe = depfiles
diff -Naur ACE_wrappers.orig/ace/Monitor_Control/Makefile.in ACE_wrappers/ace/Monitor_Control/Makefile.in
--- ACE_wrappers.orig/ace/Monitor_Control/Makefile.in	2010-10-27 06:09:32.000000000 -0400
+++ ACE_wrappers/ace/Monitor_Control/Makefile.in	2010-12-27 14:05:27.000000000 -0500
@@ -119,8 +119,7 @@
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 	$(AM_CXXFLAGS) $(CXXFLAGS) \
 	$(libACE_Monitor_Control_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_WINCE_FALSE@am_libACE_Monitor_Control_la_rpath = -rpath \
-@BUILD_WINCE_FALSE@	$(libdir)
+@BUILD_WINCE_FALSE@am_libACE_Monitor_Control_la_rpath =
 DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/aux_config/depcomp
 am__depfiles_maybe = depfiles
diff -Naur ACE_wrappers.orig/ace/QoS/Makefile.in ACE_wrappers/ace/QoS/Makefile.in
--- ACE_wrappers.orig/ace/QoS/Makefile.in	2010-10-27 06:09:32.000000000 -0400
+++ ACE_wrappers/ace/QoS/Makefile.in	2010-12-27 14:05:27.000000000 -0500
@@ -97,7 +97,7 @@
 libACE_QoS_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(libACE_QoS_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_QOS_TRUE@am_libACE_QoS_la_rpath = -rpath $(libdir)
+@BUILD_QOS_TRUE@am_libACE_QoS_la_rpath = 
 DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/aux_config/depcomp
 am__depfiles_maybe = depfiles
diff -Naur ACE_wrappers.orig/ace/SSL/Makefile.in ACE_wrappers/ace/SSL/Makefile.in
--- ACE_wrappers.orig/ace/SSL/Makefile.in	2010-10-27 06:09:32.000000000 -0400
+++ ACE_wrappers/ace/SSL/Makefile.in	2010-12-27 14:05:27.000000000 -0500
@@ -99,7 +99,7 @@
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(libACE_SSL_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_ACE_FOR_TAO_FALSE@@BUILD_SSL_TRUE@am_libACE_SSL_la_rpath =  \
-@BUILD_ACE_FOR_TAO_FALSE@@BUILD_SSL_TRUE@	-rpath $(libdir)
+@BUILD_ACE_FOR_TAO_FALSE@@BUILD_SSL_TRUE@	
 DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/aux_config/depcomp
 am__depfiles_maybe = depfiles
diff -Naur ACE_wrappers.orig/ACEXML/apps/svcconf/Makefile.in ACE_wrappers/ACEXML/apps/svcconf/Makefile.in
--- ACE_wrappers.orig/ACEXML/apps/svcconf/Makefile.in	2010-10-27 06:09:28.000000000 -0400
+++ ACE_wrappers/ACEXML/apps/svcconf/Makefile.in	2010-12-27 14:05:27.000000000 -0500
@@ -110,7 +110,7 @@
 	$(AM_CXXFLAGS) $(CXXFLAGS) \
 	$(libACEXML_XML_Svc_Conf_Parser_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_ACEXML_TRUE@@BUILD_ACE_FOR_TAO_FALSE@am_libACEXML_XML_Svc_Conf_Parser_la_rpath =  \
-@BUILD_ACEXML_TRUE@@BUILD_ACE_FOR_TAO_FALSE@	-rpath $(libdir)
+@BUILD_ACEXML_TRUE@@BUILD_ACE_FOR_TAO_FALSE@	
 DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/aux_config/depcomp
 am__depfiles_maybe = depfiles
diff -Naur ACE_wrappers.orig/ACEXML/common/Makefile.in ACE_wrappers/ACEXML/common/Makefile.in
--- ACE_wrappers.orig/ACEXML/common/Makefile.in	2010-10-27 06:09:28.000000000 -0400
+++ ACE_wrappers/ACEXML/common/Makefile.in	2010-12-27 14:05:27.000000000 -0500
@@ -146,7 +146,7 @@
 libACEXML_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(libACEXML_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ACE_FOR_TAO_FALSE@am_libACEXML_la_rpath = -rpath $(libdir)
+@BUILD_ACE_FOR_TAO_FALSE@am_libACEXML_la_rpath = 
 DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/aux_config/depcomp
 am__depfiles_maybe = depfiles
diff -Naur ACE_wrappers.orig/ACEXML/parser/parser/Makefile.in ACE_wrappers/ACEXML/parser/parser/Makefile.in
--- ACE_wrappers.orig/ACEXML/parser/parser/Makefile.in	2010-10-27 06:09:28.000000000 -0400
+++ ACE_wrappers/ACEXML/parser/parser/Makefile.in	2010-12-27 14:05:27.000000000 -0500
@@ -94,8 +94,7 @@
 libACEXML_Parser_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(libACEXML_Parser_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ACE_FOR_TAO_FALSE@am_libACEXML_Parser_la_rpath = -rpath \
-@BUILD_ACE_FOR_TAO_FALSE@	$(libdir)
+@BUILD_ACE_FOR_TAO_FALSE@am_libACEXML_Parser_la_rpath =
 DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/aux_config/depcomp
 am__depfiles_maybe = depfiles
diff -Naur ACE_wrappers.orig/apps/gperf/Makefile.in ACE_wrappers/apps/gperf/Makefile.in
--- ACE_wrappers.orig/apps/gperf/Makefile.in	2010-10-27 06:09:34.000000000 -0400
+++ ACE_wrappers/apps/gperf/Makefile.in	2010-12-27 14:05:27.000000000 -0500
@@ -308,8 +308,7 @@
 top_srcdir = @top_srcdir@
 SUBDIRS = \
         . \
-        src \
-        tests
+	src
 
 man_MANS = ace_gperf.1
 all: all-recursive
diff -Naur ACE_wrappers.orig/Kokyu/Makefile.in ACE_wrappers/Kokyu/Makefile.in
--- ACE_wrappers.orig/Kokyu/Makefile.in	2010-10-27 06:09:30.000000000 -0400
+++ ACE_wrappers/Kokyu/Makefile.in	2010-12-27 14:05:27.000000000 -0500
@@ -457,7 +457,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libKokyu.la: $(libKokyu_la_OBJECTS) $(libKokyu_la_DEPENDENCIES) 
-	$(libKokyu_la_LINK) -rpath $(libdir) $(libKokyu_la_OBJECTS) $(libKokyu_la_LIBADD) $(LIBS)
+	$(libKokyu_la_LINK)  $(libKokyu_la_OBJECTS) $(libKokyu_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
diff -Naur ACE_wrappers.orig/protocols/ace/HTBP/Makefile.in ACE_wrappers/protocols/ace/HTBP/Makefile.in
--- ACE_wrappers.orig/protocols/ace/HTBP/Makefile.in	2010-10-27 06:09:49.000000000 -0400
+++ ACE_wrappers/protocols/ace/HTBP/Makefile.in	2010-12-27 14:05:27.000000000 -0500
@@ -105,7 +105,7 @@
 libACE_HTBP_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(libACE_HTBP_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ACE_FOR_TAO_FALSE@am_libACE_HTBP_la_rpath = -rpath $(libdir)
+@BUILD_ACE_FOR_TAO_FALSE@am_libACE_HTBP_la_rpath = 
 DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/aux_config/depcomp
 am__depfiles_maybe = depfiles
diff -Naur ACE_wrappers.orig/protocols/ace/RMCast/Makefile.in ACE_wrappers/protocols/ace/RMCast/Makefile.in
--- ACE_wrappers.orig/protocols/ace/RMCast/Makefile.in	2010-10-27 06:09:49.000000000 -0400
+++ ACE_wrappers/protocols/ace/RMCast/Makefile.in	2010-12-27 14:05:27.000000000 -0500
@@ -101,7 +101,7 @@
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(libACE_RMCast_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_ACE_FOR_TAO_FALSE@@BUILD_THREADS_TRUE@am_libACE_RMCast_la_rpath =  \
-@BUILD_ACE_FOR_TAO_FALSE@@BUILD_THREADS_TRUE@	-rpath $(libdir)
+@BUILD_ACE_FOR_TAO_FALSE@@BUILD_THREADS_TRUE@	
 DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/aux_config/depcomp
 am__depfiles_maybe = depfiles