diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cd11dd88442..01d7ec86580 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-06  Bruce Korb  <bkorb@gnu.org>
+
+	* fixinc/Makefile.*: Reduce differences to (ultimately) reduce
+	the number of them.
+
 2000-11-06  J. David Anglin  <dave@hiauly1.hia.nrc.ca>
 
 	* pa.c: Include expr.h before c-tree.h.
diff --git a/gcc/fixinc/Makefile.BEOS b/gcc/fixinc/Makefile.BEOS
index 5ebbd36122d..ca68ff199d8 100644
--- a/gcc/fixinc/Makefile.BEOS
+++ b/gcc/fixinc/Makefile.BEOS
@@ -23,9 +23,9 @@
 # Its purpose is to build the fixincl and applyfix programs for
 # the Be port of GCC.
 
-FIXINC_DEFS = -DIN_GCC $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -DSEPARATE_FIX_PROC
+FL_LIST = $(CFLAGS) $(CPPFLAGS) $(WARN_CFLAGS)
+FIXINC_DEFS = -DIN_GCC $(FL_LIST) $(INCLUDES) -DSEPARATE_FIX_PROC
 
-target=i586-pc-beos
 # Directory where sources are, from where we are.
 VPATH = $(srcdir)
 subdir = fixinc
@@ -64,19 +64,19 @@ OBJ = fixincl.o fixtests.o fixfixes.o server.o procopen.o \
 
 HDR = server.h gnu-regex.h fixlib.h machname.h
 
-TARGETS = fixincl applyfix
+TARGETS = fixincl@exeext@ applyfix@exeext@
 
 all : $(TARGETS)
 gen : $(srcdir)/fixincl.x
 
 FIXINCL_OBJ = fixincl.o fixlib.o fixtests.o gnu-regex.o
 
-fixincl: $(FIXINCL_OBJ) $(LIBERTY)
+fixincl@exeext@: $(FIXINCL_OBJ) $(LIBERTY)
 	$(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(FIXINCL_OBJ) $(LIBERTY)
 
 APPLY_OBJ = fixfixes.o fixlib.o gnu-regex.o
 
-applyfix: $(APPLY_OBJ) $(LIBERTY)
+applyfix@exeext@: $(APPLY_OBJ) $(LIBERTY)
 	$(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(APPLY_OBJ) $(LIBERTY)
 
 $(OBJ)      : $(HDR)
@@ -100,14 +100,14 @@ $(srcdir)/fixincl.x: fixincl.tpl inclhack.def
 clean:
 	rm -f *.o $(TARGETS) machname.h *~
 
-maintainer-clean: clean
+maintainer-clean : clean
 	rm -f $(srcdir)/fixincl.x
 
 #  Build the executable and copy up into gcc dir.
 #  We still copy the script because we still have alternative scripts.
 #
 install-bin : $(TARGETS)
-	./fixincl -v
+	./fixincl@exeext@ -v
 	@if [ -f ../fixinc.sh ] ; then rm -f ../fixinc.sh || \
 	    mv -f ../fixinc.sh ../fixinc.sh.$$ || exit 1 ; fi
 	@if [ -f ./fixincl.sh ] ; \
diff --git a/gcc/fixinc/Makefile.DOS b/gcc/fixinc/Makefile.DOS
index cd134ccea97..450ca6b574a 100644
--- a/gcc/fixinc/Makefile.DOS
+++ b/gcc/fixinc/Makefile.DOS
@@ -23,10 +23,9 @@
 # Its purpose is to build the fixincl and applyfix programs for
 # the DJGPP (aka MS-DOS) port of GCC.
 
-FIXINC_DEFS = -DIN_GCC $(CFLAGS) $(CPPFLAGS) $(INCLUDES) \
- -D__MSDOS__ -DSEPARATE_FIX_PROC
+FL_LIST = $(CFLAGS) $(CPPFLAGS) $(WARN_CFLAGS)
+FIXINC_DEFS = -DIN_GCC $(FL_LIST) $(INCLUDES) -DSEPARATE_FIX_PROC
 
-target=i386-pc-msdosdjgpp
 # Directory where sources are, from where we are.
 VPATH = $(srcdir)
 subdir = fixinc
@@ -65,19 +64,19 @@ OBJ = fixincl.o fixtests.o fixfixes.o server.o procopen.o \
 
 HDR = server.h gnu-regex.h fixlib.h machname.h
 
-TARGETS = fixincl.exe applyfix.exe
+TARGETS = fixincl@exeext@ applyfix@exeext@
 
 all : $(TARGETS)
 gen : $(srcdir)/fixincl.x
 
 FIXINCL_OBJ = fixincl.o fixlib.o fixtests.o gnu-regex.o
 
-fixincl.exe: $(FIXINCL_OBJ) $(LIBERTY)
+fixincl@exeext@: $(FIXINCL_OBJ) $(LIBERTY)
 	$(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(FIXINCL_OBJ) $(LIBERTY)
 
 APPLY_OBJ = fixfixes.o fixlib.o gnu-regex.o
 
-applyfix.exe: $(APPLY_OBJ) $(LIBERTY)
+applyfix@exeext@: $(APPLY_OBJ) $(LIBERTY)
 	$(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(APPLY_OBJ) $(LIBERTY)
 
 $(OBJ)      : $(HDR)
@@ -108,7 +107,7 @@ maintainer-clean : clean
 #  We still copy the script because we still have alternative scripts.
 #
 install-bin : $(TARGETS)
-	./fixincl.exe -v
+	./fixincl@exeext@ -v
 	@if [ -f ../fixinc.sh ] ; then rm -f ../fixinc.sh || \
 	    mv -f ../fixinc.sh ../fixinc.sh.$$ || exit 1 ; fi
 	@if [ -f ./fixincl.sh ] ; \
diff --git a/gcc/fixinc/Makefile.in b/gcc/fixinc/Makefile.in
index 22088bd5e8d..c0d72d5eeaf 100644
--- a/gcc/fixinc/Makefile.in
+++ b/gcc/fixinc/Makefile.in
@@ -22,9 +22,9 @@
 # The makefile built from this file lives in the fixinc subdirectory.
 # Its purpose is to build the any-platforms fixinc.sh script.
 
-FIXINC_DEFS = -DIN_GCC $(WARN_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(INCLUDES)
+FL_LIST = $(CFLAGS) $(CPPFLAGS) $(WARN_CFLAGS)
+FIXINC_DEFS = -DIN_GCC $(FL_LIST) $(INCLUDES)
 
-target=@target@
 # Directory where sources are, from where we are.
 srcdir = @srcdir@
 VPATH = $(srcdir)
@@ -64,12 +64,12 @@ OBJ = fixincl.o fixtests.o fixfixes.o server.o procopen.o \
 
 HDR = server.h gnu-regex.h fixlib.h machname.h
 
-TARGETS = fixincl
+TARGETS = fixincl@exeext@
 
 all : $(TARGETS)
 gen : $(srcdir)/fixincl.x
 
-fixincl: $(OBJ) $(LIBERTY)
+fixincl@exeext@: $(OBJ) $(LIBERTY)
 	$(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(OBJ) $(LIBERTY)
 
 $(OBJ)      : $(HDR)
@@ -100,7 +100,7 @@ maintainer-clean : clean
 #  We still copy the script because we still have alternative scripts.
 #
 install-bin : $(TARGETS)
-	./fixincl -v
+	./fixincl@exeext@ -v
 	@if [ -f ../fixinc.sh ] ; then rm -f ../fixinc.sh || \
 	    mv -f ../fixinc.sh ../fixinc.sh.$$ || exit 1 ; fi
 	@if [ -f ./fixincl.sh ] ; \
@@ -115,7 +115,7 @@ Makefile: Makefile.in ../config.status
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
 	  $(SHELL) ./config.status
 
-check : fixincl
+check : $(TARGETS)
 	autogen -T $(srcdir)/check.tpl $(srcdir)/inclhack.def
 	$(SHELL) ./check.sh $(srcdir)/tests/base
 	@rm -f ./check.sh
diff --git a/gcc/fixinc/fixincl.c b/gcc/fixinc/fixincl.c
index 2601506c096..206b04f405c 100644
--- a/gcc/fixinc/fixincl.c
+++ b/gcc/fixinc/fixincl.c
@@ -1015,7 +1015,7 @@ fix_with_system (p_fixd, pz_fix_file, pz_file_source, pz_temp_file)
       /*
        *  add the file machinations.
        */
-#ifdef SEPARATE_FIX_PROC
+#ifdef __MSDOS__
       sprintf (pz_scan, z_cmd_fmt, pz_file_source, pz_temp_file );
 #else
       sprintf (pz_scan, z_cmd_fmt, pz_file_source, pz_temp_file,