Merge branch '3.3-maint'

* 3.3-maint:
  doc: Improve instructions on how to compile in different directories
  Split .incbin directive in ccache source code to enable cache hits

diff --cc MANUAL.txt
Simple merge

diff --cc ccache.c
index 369db9a93a6756a45ea67f3c83c66f23773fcf04,3044016c23a531529804db52425caadb58c25356..36ed1cca690c57563e17796eb6777be07e4cc972
--- 1/ccache.c
--- 2/ccache.c
+++ b/ccache.c
@@@ -884,26 -844,13 +884,26 @@@ process_preprocessed_file(struct mdfou
                        p = q; // Everything of interest between p and q has been hashed now.
                } else if (q[0] == '.' && q[1] == 'i' && q[2] == 'n' && q[3] == 'c'
                           && q[4] == 'b' && q[5] == 'i' && q[6] == 'n') {
-                       // An assembler .incbin statement (which could be part of inline
-                       // assembly) refers to an external file. If the file changes, the hash
-                       // should change as well, but finding out what file to hash is too hard
-                       // for ccache, so just bail out.
-                       cc_log("Found unsupported .incbin directive in source code");
+                       // An assembler .inc bin (without the space) statement, which could be
+                       // part of inline assembly, refers to an external file. If the file
+                       // changes, the hash should change as well, but finding out what file to
+                       // hash is too hard for ccache, so just bail out.
+                       cc_log("Found unsupported .inc" "bin directive in source code");
                        stats_update(STATS_UNSUPPORTED_DIRECTIVE);
                        failed();
 +              } else if (pump && strncmp(q, "_________", 9) == 0) {
 +                      // Unfortunately the distcc-pump wrapper outputs standard output lines:
 +                      // __________Using distcc-pump from /usr/bin
 +                      // __________Using # distcc servers in pump mode
 +                      // __________Shutting down distcc-pump include server
 +                      while (q < end && *q != '\n') {
 +                              q++;
 +                      }
 +                      if (*q == '\n') {
 +                              q++;
 +                      }
 +                      p = q;
 +                      continue;
                } else {
                        q++;
                }