accommodate ancient bourne shells

From-SVN: r38498

4 files changed, 7 insertions, 237 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9be4297..4f1c1e1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-27  Bruce Korb  <bkorb@gnu.org>
+
+	* fixinc/Makefile.in: fix for ancient Bourne shell
+	* fixinc/Makefile.BEOS: obsolete
+	* fixinc/Makefile.DOS: obsolete
+
 2000-12-27  Bernd Schmidt  <bernds@redhat.com>
 
 	* sched-deps.c (get_condition, conditions_mutex_p): New functions.
diff --git a/gcc/fixinc/Makefile.BEOS b/gcc/fixinc/Makefile.BEOS
deleted file mode 100644
index 3994ebd..0000000
--- a/gcc/fixinc/Makefile.BEOS
+++ /dev/null
@@ -1,118 +0,0 @@
-# Makefile for GNU compilers on a Be box.
-#
-#   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
-
-#This file is part of GNU CC.
-
-#GNU CC is free software; you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation; either version 2, or (at your option)
-#any later version.
-
-#GNU CC is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with GNU CC; see the file COPYING.  If not, write to
-#the Free Software Foundation, 59 Temple Place - Suite 330,
-#Boston, MA 02111-1307, USA.
-
-# This Makefile.BEOS file lives in the fixinc subdirectory.
-# Its purpose is to build the fixincl and applyfix programs for
-# the Be port of GCC.
-
-FL_LIST = $(CFLAGS) $(CPPFLAGS) $(WARN_CFLAGS)
-FIXINC_DEFS = -DIN_GCC $(FL_LIST) $(INCLUDES) -DSEPARATE_FIX_PROC
-
-# Directory where sources are, from where we are.
-VPATH = $(srcdir)
-subdir = fixinc
-
-# End of variables for you to override.
-
-default : all
-
-# Now figure out from those variables how to compile and link.
-
-# Specify the directories to be searched for header files.
-# Both . and srcdir are used, in that order.
-#
-INCLUDES = -I. -I.. -I$(srcdir) -I$(srcdir)/.. \
--I$(srcdir)/../config -I$(srcdir)/../../include
-
-# Always use -I$(srcdir)/config when compiling.
-.c.o:
-	$(CC) -c $(FIXINC_DEFS) $<
-
-# The only suffixes we want for implicit rules are .c and .o.
-.SUFFIXES:
-.SUFFIXES: .c .o
-
-#
-
-## # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-##
-##  Makefile for constructing the "best" include fixer we can
-##
-## # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
-LIBERTY = ../../libiberty/libiberty.a
-OBJ = fixincl.o fixtests.o fixfixes.o server.o procopen.o \
-      gnu-regex.o fixlib.o
-
-HDR = server.h gnu-regex.h fixlib.h machname.h
-
-TARGETS = fixincl@build_exeext@ applyfix@build_exeext@
-
-all : $(TARGETS)
-gen : $(srcdir)/fixincl.x
-
-FIXINCL_OBJ = fixincl.o fixlib.o fixtests.o gnu-regex.o
-
-fixincl@build_exeext@: $(FIXINCL_OBJ) $(LIBERTY)
-	$(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(FIXINCL_OBJ) $(LIBERTY)
-
-APPLY_OBJ = fixfixes.o fixlib.o gnu-regex.o
-
-applyfix@build_exeext@: $(APPLY_OBJ) $(LIBERTY)
-	$(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(APPLY_OBJ) $(LIBERTY)
-
-$(OBJ)      : $(HDR)
-fixincl.o   : $(srcdir)/fixincl.x fixincl.c
-fixtests.o  : fixtests.c
-fixfixes.o  : fixfixes.c $(srcdir)/fixincl.x
-server.o    : server.c
-procopen.o  : procopen.c
-gnu-regex.o : gnu-regex.c
-fixlib.o    : fixlib.c
-
-#  'machname.h' is built in the build directory.
-#  'fixincl.x' in the source dir.
-#
-machname.h: ../specs
-	$(SHELL) $(srcdir)/genfixes $@
-
-$(srcdir)/fixincl.x: fixincl.tpl inclhack.def
-	cd $(srcdir) ; $(SHELL) ./genfixes $@
-
-clean:
-	rm -f *.o $(TARGETS) machname.h *~
-
-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
-	@if [ -f ../fixinc.sh ] ; then rm -f ../fixinc.sh || \
-	    mv -f ../fixinc.sh ../fixinc.sh.$$ || exit 1 ; fi
-	@if [ -f ./fixincl.sh ] ; \
-	then echo cp ./fixincl.sh ../fixinc.sh ; \
-		cp ./fixincl.sh ../fixinc.sh ; \
-	else echo cp $(srcdir)/fixincl.sh ../fixinc.sh ; \
-		cp $(srcdir)/fixincl.sh ../fixinc.sh ; fi
-	chmod 755 ../fixinc.sh
diff --git a/gcc/fixinc/Makefile.DOS b/gcc/fixinc/Makefile.DOS
deleted file mode 100644
index a606a7a..0000000
--- a/gcc/fixinc/Makefile.DOS
+++ /dev/null
@@ -1,118 +0,0 @@
-# Makefile for GNU compilers on a DOS box.
-#
-#   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
-
-#This file is part of GNU CC.
-
-#GNU CC is free software; you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation; either version 2, or (at your option)
-#any later version.
-
-#GNU CC is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with GNU CC; see the file COPYING.  If not, write to
-#the Free Software Foundation, 59 Temple Place - Suite 330,
-#Boston, MA 02111-1307, USA.
-
-# This Makefile.DOS file lives in the fixinc subdirectory.
-# Its purpose is to build the fixincl and applyfix programs for
-# the DJGPP (aka MS-DOS) port of GCC.
-
-FL_LIST = $(CFLAGS) $(CPPFLAGS) $(WARN_CFLAGS)
-FIXINC_DEFS = -DIN_GCC $(FL_LIST) $(INCLUDES) -DSEPARATE_FIX_PROC
-
-# Directory where sources are, from where we are.
-VPATH = $(srcdir)
-subdir = fixinc
-
-# End of variables for you to override.
-
-default : all
-
-# Now figure out from those variables how to compile and link.
-
-# Specify the directories to be searched for header files.
-# Both . and srcdir are used, in that order.
-#
-INCLUDES = -I. -I.. -I$(srcdir) -I$(srcdir)/.. \
--I$(srcdir)/../config -I$(srcdir)/../../include
-
-# Always use -I$(srcdir)/config when compiling.
-.c.o:
-	$(CC) -c $(FIXINC_DEFS) $<
-
-# The only suffixes we want for implicit rules are .c and .o.
-.SUFFIXES:
-.SUFFIXES: .c .o
-
-#
-
-## # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-##
-##  Makefile for constructing the "best" include fixer we can
-##
-## # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
-LIBERTY = ../../libiberty/libiberty.a
-OBJ = fixincl.o fixtests.o fixfixes.o server.o procopen.o \
-      gnu-regex.o fixlib.o
-
-HDR = server.h gnu-regex.h fixlib.h machname.h
-
-TARGETS = fixincl@build_exeext@ applyfix@build_exeext@
-
-all : $(TARGETS)
-gen : $(srcdir)/fixincl.x
-
-FIXINCL_OBJ = fixincl.o fixlib.o fixtests.o gnu-regex.o
-
-fixincl@build_exeext@: $(FIXINCL_OBJ) $(LIBERTY)
-	$(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(FIXINCL_OBJ) $(LIBERTY)
-
-APPLY_OBJ = fixfixes.o fixlib.o gnu-regex.o
-
-applyfix@build_exeext@: $(APPLY_OBJ) $(LIBERTY)
-	$(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(APPLY_OBJ) $(LIBERTY)
-
-$(OBJ)      : $(HDR)
-fixincl.o   : $(srcdir)/fixincl.x fixincl.c
-fixtests.o  : fixtests.c
-fixfixes.o  : fixfixes.c $(srcdir)/fixincl.x
-server.o    : server.c
-procopen.o  : procopen.c
-gnu-regex.o : gnu-regex.c
-fixlib.o    : fixlib.c
-
-#  'machname.h' is built in the build directory.
-#  'fixincl.x' in the source dir.
-#
-machname.h: ../specs
-	$(SHELL) $(srcdir)/genfixes $@
-
-$(srcdir)/fixincl.x: fixincl.tpl inclhack.def
-	cd $(srcdir) ; $(SHELL) ./genfixes $@
-
-clean:
-	rm -f *.o $(TARGETS) machname.h *~
-
-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
-	@if [ -f ../fixinc.sh ] ; then rm -f ../fixinc.sh || \
-	    mv -f ../fixinc.sh ../fixinc.sh.$$ || exit 1 ; fi
-	@if [ -f ./fixincl.sh ] ; \
-	then echo cp ./fixincl.sh ../fixinc.sh ; \
-		cp ./fixincl.sh ../fixinc.sh ; \
-	else echo cp $(srcdir)/fixincl.sh ../fixinc.sh ; \
-		cp $(srcdir)/fixincl.sh ../fixinc.sh ; fi
-	chmod 755 ../fixinc.sh
diff --git a/gcc/fixinc/Makefile.in b/gcc/fixinc/Makefile.in
index 8615518..88f615d 100644
--- a/gcc/fixinc/Makefile.in
+++ b/gcc/fixinc/Makefile.in
@@ -117,7 +117,7 @@ maintainer-clean : clean
 install-bin : $(TARGETS)
 	./fixincl -v
 	@if [ -f ../fixinc.sh ] ; then rm -f ../fixinc.sh || \
-	    mv -f ../fixinc.sh ../fixinc.sh.$$ || exit 1 ; fi
+	    mv -f ../fixinc.sh ../fixinc.sh.$$ || exit 1 ; else : ; fi
 	@cp $(srcdir)/fixincl.sh ../fixinc.sh
 	chmod 755 ../fixinc.sh