--- Makefile.in.orig	2004-01-15 23:49:10.000000000 +0000
+++ Makefile.in	2004-01-20 19:34:18.000000000 +0000
@@ -92,7 +92,11 @@
 # pattern rule for everything.
 # This vpath could be extended within the Make-lang fragments.
 
+ifneq ($(DJGPP),)
+vpath %.texi $(docdir);$(docdir)/include
+else
 vpath %.texi $(docdir):$(docdir)/include
+endif
 
 # ----
 # Default values for variables overridden in Makefile fragments.
@@ -3316,6 +3320,8 @@
 	OUTPUT_OPTION="-o \$$@"
 
 STAGE2_FLAGS_TO_PASS = \
+ 	libsubdir=$(libsubdir) \
+ 	gcc_version=$(gcc_version) \
 	CFLAGS="$(BOOT_CFLAGS)" \
 	WERROR="@WERROR@" \
 
@@ -3333,7 +3339,8 @@
 # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
 # overrideable (for a bootstrap build stage1 also builds gcc.info).
 stage1_build:
-	$(MAKE) CC="$(CC)" libdir=$(libdir) LANGUAGES="$(BOOT_LANGUAGES)" \
+	$(MAKE) CC="$(CC)" libdir=$(libdir) libsubdir=$(libsubdir) \
+		gcc_version=$(gcc_version) LANGUAGES="$(BOOT_LANGUAGES)" \
 		CFLAGS="$(STAGE1_CFLAGS)" MAKEINFO="$(MAKEINFO)" \
 		MAKEINFOFLAGS="$(MAKEINFOFLAGS)" COVERAGE_FLAGS= \
 		OBJS-onestep="$(OBJS)"