Merge "Fix indirect misuse of $(my-dir)."