diff -r 12cf6bfd8c05 -r 78962d89f283 src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java Wed Oct 17 16:43:26 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java Tue Oct 23 13:20:37 2012 -0700 @@ -141,11 +141,9 @@ //documented AND if we have not documented a class from the same //package already. Otherwise, we are making duplicate copies. Util.copyDocFiles(configuration, - Util.getPackageSourcePath(configuration, - annotationTypeDoc.containingPackage()) + - DirectoryManager.getDirectoryPath( - annotationTypeDoc.containingPackage()) - + File.separator, DocletConstants.DOC_FILES_DIR_NAME, true); + new File(Util.getPackageSourcePath(configuration, containingPackage), + DocPath.forPackage(annotationTypeDoc).getPath()), + DocPaths.DOC_FILES, true); containingPackagesSeen.add(containingPackage.name()); } }