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