Merge "Fix build by using $(DIST_DIR)"