Fix the build by working around GNU Make's issues