--- Makefile.in~1	2006-03-04 15:07:45.000000000 +0200
+++ Makefile.in	2006-03-05 09:10:12.000000000 +0200
@@ -104,7 +104,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.
@@ -489,6 +493,7 @@
 objext = .o
 exeext = @host_exeext@
 build_exeext = @build_exeext@
+libstdcxx_incdir_base=@libstdcxx_incdir_base@
 
 # Directory in which to put man pages.
 mandir = @mandir@
@@ -3168,8 +3173,8 @@
 
 # Build fixed copies of system files.
 stmp-fixinc: gsyslimits.h macro_list \
-  $(build_objdir)/fixincludes/fixincl \
   $(build_objdir)/fixincludes/fixinc.sh
+	$(MAKE) -C $(build_objdir)/fixincludes all
 	@if ! $(inhibit_libc) && test ! -d ${SYSTEM_HEADER_DIR}; then \
 	  echo The directory that should contain system headers does not exist: >&2 ; \
 	  echo "  ${SYSTEM_HEADER_DIR}" >&2 ; \