Improve compatibility with old Makefile