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