2 files changed, 23 insertions, 3 deletions

diff --git a/src/functiondirectoriesin.cpp b/src/functiondirectoriesin.cpp
index 052125e..ef2f097 100644
--- a/src/functiondirectoriesin.cpp
+++ b/src/functiondirectoriesin.cpp
@@ -24,7 +24,17 @@ void FunctionDirectoriesIn::execute( Build *bld, const StringList &lInput, Strin
 
         struct dirent *e;
 
-        //std::string prefix = lParams.front() + "/";
+        std::string prefix;
+        if( lParams.size() >= 2 )
+        {
+                StringList::iterator i = lParams.begin();
+                i++;
+                prefix = *i;
+        }
+        else
+        {
+                prefix = lParams.front() + "/";
+        }
 
         while( (e = readdir( d )) )
         {
@@ -32,7 +42,7 @@ void FunctionDirectoriesIn::execute( Build *bld, const StringList &lInput, Strin
                 {
                         if( e->d_name[0] == '.' || e->d_name[0] == '\0' )
                                 continue;
-                        lOutput.push_back( e->d_name );
+                        lOutput.push_back( prefix + e->d_name );
                 }
         }
 
diff --git a/src/functionfilesin.cpp b/src/functionfilesin.cpp
index e1a4c2b..9b9187d 100644
--- a/src/functionfilesin.cpp
+++ b/src/functionfilesin.cpp
@@ -25,7 +25,17 @@ void FunctionFilesIn::execute( Build *bld, const StringList &lInput, StringList
 
         struct dirent *e;
 
-        std::string prefix = lParams.front() + "/";
+        std::string prefix;
+        if( lParams.size() >= 2 )
+        {
+                StringList::iterator i = lParams.begin();
+                i++;
+                prefix = *i;
+        }
+        else
+        {
+                prefix = lParams.front() + "/";
+        }
 
         while( (e = readdir( d )) )
         {