In further testing I found that Automake complains unless the corresponding change is also made to nt/gnulib.mk, so I'll also throw in the attached simplification to fix that problem.