--- a/make/InitSupport.gmk	Thu May 02 20:47:23 2019 +0200
+++ b/make/InitSupport.gmk	Tue May 07 06:58:55 2019 -0700
@@ -387,7 +387,7 @@
 	fi
         # Re-run configure with the same arguments (and possibly some additional),
         # must be done after patching.
-	( cd $(OUTPUTDIR) && PATH="$(ORIGINAL_PATH)" \
+	( cd $(CONFIGURE_START_DIR) && PATH="$(ORIGINAL_PATH)" \
 	    $(BASH) $(topdir)/configure $(CONFIGURE_COMMAND_LINE) $(COMPARE_BUILD_CONF))
   endef