Fix from Marc Espie to make included-popt work with VPATH builds.