1 files changed, 18 insertions, 12 deletions
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
index 47b3b4eb256..49b2d839f38 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
@@ -2,13 +2,16 @@
 // $Id$
 
 project(*Server): taoserver, tc_iiop, pi_server {
-
   after += Curren_Test_Lib_Client Current_Test_Lib_Server
-
-  includes += . ../lib
-
-  libs += Current_Test_Lib_Client Current_Test_Lib_Server
-  libpaths += ../lib
+  libs  += Current_Test_Lib_Client Current_Test_Lib_Server
+
+  specific (automake) {
+    includes += $(srcdir) $(srcdir)/../lib
+    libpaths += $(srcdir)/../lib
+  } else {
+    includes += . ../lib
+    libpaths += ../lib
+  }
 
   Source_Files {
     server.cpp
@@ -23,13 +26,16 @@ project(*Server): taoserver, tc_iiop, pi_server {
 }
 
 project(*Client): taoclient, tc_iiop, dynamicinterface {
-
   after += *Server Current_Test_Lib_Client Current_Test_Lib_Server
-
-  includes += . ../lib
-
-  libs += Current_Test_Lib_Client Current_Test_Lib_Server
-  libpaths += ../lib
+  libs  += Current_Test_Lib_Client Current_Test_Lib_Server
+
+  specific (automake) {
+    includes += $(srcdir) $(srcdir)/../lib
+    libpaths += $(srcdir)/../lib
+  } else {
+    includes += . ../lib
+    libpaths += ../lib
+  }
 
   Source_Files {
     client.cpp