--- old/make/Docs.gmk	2018-02-02 13:16:21.431988415 -0800
+++ new/make/Docs.gmk	2018-02-02 13:16:21.015970197 -0800
@@ -200,7 +200,7 @@
 #
 define setup_gengraph_dot_to_png
   $1_$2_DOT_SRC :=  $$($1_GENGRAPHS_DIR)/$2.dot
-  $1_$2_PNG_TARGET := $$($1_TARGET_DIR)/$2-graph.png
+  $1_$2_PNG_TARGET := $$($1_TARGET_DIR)/$2/module-graph.png
 
     # For each module needing a graph, create a png file from the dot file
     # generated by the GenGraphs tool and store it in the target dir.