--- a/mxtool/mx.py	Mon Nov 04 12:18:58 2013 +0100
+++ b/mxtool/mx.py	Mon Nov 04 12:20:17 2013 +0100
@@ -328,15 +328,16 @@
     def update_current_annotation_processors_file(self):
         aps = self.annotation_processors()
         outOfDate = False
-        currentApsFile = join(self.dir, '.currentAnnotationProcessors')
-        if exists(currentApsFile):
+        currentApsFile = join(self.suite.mxDir, 'currentAnnotationProcessors', self.name)
+        currentApsFileExists = exists(currentApsFile)
+        if currentApsFileExists:
             with open(currentApsFile) as fp:
                 currentAps = [l.strip() for l in fp.readlines()]
                 if currentAps != aps:
                     outOfDate = True
-        else:
-            outOfDate = True
-        if outOfDate:
+        if outOfDate or not currentApsFileExists:
+            if not exists(dirname(currentApsFile)):
+                os.mkdir(dirname(currentApsFile))
             with open(currentApsFile, 'w') as fp:
                 for ap in aps:
                     print >> fp, ap
@@ -786,7 +787,7 @@
             abort('Missing "suite=<name>" in ' + projectsFile)
 
     def _commands_name(self):
-        return 'mx_' + self.name.replace('-','_')
+        return 'mx_' + self.name.replace('-', '_')
 
     def _find_commands(self, name):
         commandsPath = join(self.mxDir, name + '.py')
@@ -1988,7 +1989,7 @@
             continue
 
         # Ensure that the output directories are clean
-        #prepareOutputDirs(p, True)
+        # prepareOutputDirs(p, True)
 
         built.add(p.name)