--- a/ProjectBuilder.st	Thu Mar 21 23:12:17 2013 +0100
+++ b/ProjectBuilder.st	Thu Mar 21 23:12:51 2013 +0100
@@ -547,14 +547,22 @@
     files := #().
 
     OperatingSystem isMSWINDOWSlike ifTrue:[
-        files := files , #( 'librun/genDate.com' ).
+        files := files , #( 
+                        'librun/genDate.com' 
+                    ).
         usedCompiler = 'tcc' ifTrue:[
             files := files , #( 
                         'support/tcc'
                     ).
         ].
     ] ifFalse:[
-        files := files , #( 'librun/genDate' ).
+        files := files , #( 
+                        "/ 'librun/genDate'   -- not needed on unix (done via script)
+                        'configurations/myConf' 
+                        'configurations/vendorConf' 
+                        'configurations/conf.inc' 
+                        'configurations/COMMON' 
+                    ).
     ].
 
     files do:[:relativePath |
@@ -564,10 +572,15 @@
             and:[ (mySTXTopDirectory / relativePath) modificationTime < (buildDirectory / 'stx' / relativePath) modificationTime
             "/ and:[ (mySTXTopDirectory / dllRelativePath) sameContentsAs:(targetBuildDir / dllRelativePath) ]
             ]]) ifFalse:[
-                (mySTXTopDirectory / relativePath) recursiveCopyTo:(buildDirectory / 'stx' / relativePath).    
+                (buildDirectory / 'stx' / relativePath) directory recursiveMakeDirectory.    
+                (mySTXTopDirectory / relativePath) isDirectory ifTrue:[
+                    (mySTXTopDirectory / relativePath) recursiveCopyTo:(buildDirectory / 'stx' / relativePath) directory.    
+                ] ifFalse:[
+                    (mySTXTopDirectory / relativePath) copyTo:(buildDirectory / 'stx' / relativePath) directory.    
+                ]
             ]
         ] ifFalse:[
-            self error:'Missing directory: ',relativePath printString mayProceed:true.
+            self error:'Missing file or directory: ',relativePath printString mayProceed:true.
         ].
     ].
 
@@ -935,7 +948,9 @@
 
     OperatingSystem isUNIXlike ifTrue:[
         "/ generate the makefile first
-        self activityNotification:('sh %1/rules/stmkmf' bindWith:mySTXTopDirectory pathName).
+        self activityNotification:('sh %1/rules/stmkmf (in %2)' 
+                    bindWith:mySTXTopDirectory pathName    
+                    with:(buildDirectory / module / directory)).
         OperatingSystem
             executeCommand:('sh %1/rules/stmkmf' bindWith:mySTXTopDirectory pathName)
             inputFrom:nil
@@ -1018,6 +1033,8 @@
 !
 
 setupBuildDirectory
+    self activityNotification:('Building in %1' bindWith:buildDirectory pathName).
+
     buildDirectory exists ifFalse:[
         buildDirectory recursiveMakeDirectory.
     ].
@@ -1027,6 +1044,7 @@
 
     self copyDirectoryForBuild:'include'.
     self copyDirectoryForBuild:'rules'.
+
     OperatingSystem isUNIXlike ifTrue:[
         self recursiveCopyDirectoryForBuild:'configurations'.
     ]