am 26bcd640: Merge "Try to catch more misuse of ."

* commit '26bcd6404031a491bfd5314d605a7dcc6b64727b':
  Try to catch more misuse of $(my-dir).