diff options
Diffstat (limited to 'src/filetarget.cpp')
-rw-r--r-- | src/filetarget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/filetarget.cpp b/src/filetarget.cpp index 65f9d70..3fefd9f 100644 --- a/src/filetarget.cpp +++ b/src/filetarget.cpp | |||
@@ -45,9 +45,10 @@ void FileTarget::addInputDir( const char *sDir ) | |||
45 | } | 45 | } |
46 | 46 | ||
47 | char *cwd = gnu_getcwd(); | 47 | char *cwd = gnu_getcwd(); |
48 | std::string base( cwd ); | 48 | std::string base;//( cwd ); |
49 | base += "/"; | 49 | //base += "/"; |
50 | base += sDir; | 50 | base += sDir; |
51 | base += "/"; | ||
51 | delete[] cwd; | 52 | delete[] cwd; |
52 | 53 | ||
53 | struct dirent *de; | 54 | struct dirent *de; |
@@ -58,7 +59,6 @@ void FileTarget::addInputDir( const char *sDir ) | |||
58 | continue; | 59 | continue; |
59 | 60 | ||
60 | std::string s( base ); | 61 | std::string s( base ); |
61 | s += "/"; | ||
62 | s += de->d_name; | 62 | s += de->d_name; |
63 | addInput( s.c_str() ); | 63 | addInput( s.c_str() ); |
64 | } | 64 | } |
@@ -70,7 +70,7 @@ void FileTarget::check( Builder &bld ) | |||
70 | { | 70 | { |
71 | Rule *pRule = bld.getRule( sRule ); | 71 | Rule *pRule = bld.getRule( sRule ); |
72 | 72 | ||
73 | std::list<std::string> tmp = pRule->execute( bld, lInput ); | 73 | std::list<std::string> tmp = pRule->execute( bld, lInput, getName() ); |
74 | lOutput.insert( lOutput.end(), tmp.begin(), tmp.end() ); | 74 | lOutput.insert( lOutput.end(), tmp.begin(), tmp.end() ); |
75 | 75 | ||
76 | bld.processRequires( lInput ); | 76 | bld.processRequires( lInput ); |