Missing merges from fixincl-branch

From-SVN: r25725

9 files changed, 37 insertions, 32 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b86d4fa..f7c232a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 12 07:54:43 1999  Bruce Korb <korb@datadesign.com>
+
+	* fixinc/fixinc.*: Some changes from the fixincl-branch
+	were not applied (??!!).  Corrected.
+
 Fri Mar 12 00:51:43 1999  Jeffrey A Law  (law@cygnus.com)
 
 	* expr.c (expand_expr): Allow a CALL_EXPR with a mode wider than
diff --git a/gcc/fixinc/fixinc.dgux b/gcc/fixinc/fixinc.dgux
index 71365c4..afdd0cd5 100755
--- a/gcc/fixinc/fixinc.dgux
+++ b/gcc/fixinc/fixinc.dgux
@@ -189,12 +189,12 @@ fi
 
 done
 
-if [ x${INSTALL_ASSERT_H} != x ] ;
+if [ x${INSTALL_ASSERT_H} != x ]
 then
   cd ${ORIG_DIR}
-  rm -f include/assert.h;
-  cp $(srcdir)/assert.h include/assert.h;
-  chmod a+r include/assert.h;
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
 fi
 
 exit 0
diff --git a/gcc/fixinc/fixinc.irix b/gcc/fixinc/fixinc.irix
index 1fa53a7..d12c786 100755
--- a/gcc/fixinc/fixinc.irix
+++ b/gcc/fixinc/fixinc.irix
@@ -232,12 +232,12 @@ fi
 
 done
 
-if [ x${INSTALL_ASSERT_H} != x ] ;
+if [ x${INSTALL_ASSERT_H} != x ]
 then
   cd ${ORIG_DIR}
-  rm -f include/assert.h;
-  cp $(srcdir)/assert.h include/assert.h;
-  chmod a+r include/assert.h;
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
 fi
 
 exit 0
diff --git a/gcc/fixinc/fixinc.ptx b/gcc/fixinc/fixinc.ptx
index ac8478a..c205e21 100644
--- a/gcc/fixinc/fixinc.ptx
+++ b/gcc/fixinc/fixinc.ptx
@@ -263,12 +263,12 @@ fi
 
 done
 
-if [ x${INSTALL_ASSERT_H} != x ] ;
+if [ x${INSTALL_ASSERT_H} != x ]
 then
   cd ${ORIG_DIR}
-  rm -f include/assert.h;
-  cp $(srcdir)/assert.h include/assert.h;
-  chmod a+r include/assert.h;
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
 fi
 
 exit 0
diff --git a/gcc/fixinc/fixinc.sco b/gcc/fixinc/fixinc.sco
index e580956..11e78f7 100755
--- a/gcc/fixinc/fixinc.sco
+++ b/gcc/fixinc/fixinc.sco
@@ -434,12 +434,12 @@ fi
 
 done
 
-if [ x${INSTALL_ASSERT_H} != x ] ;
+if [ x${INSTALL_ASSERT_H} != x ]
 then
   cd ${ORIG_DIR}
-  rm -f include/assert.h;
-  cp $(srcdir)/assert.h include/assert.h;
-  chmod a+r include/assert.h;
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
 fi
 
 exit 0
diff --git a/gcc/fixinc/fixinc.svr4 b/gcc/fixinc/fixinc.svr4
index 840a7d4..dedf4eb 100755
--- a/gcc/fixinc/fixinc.svr4
+++ b/gcc/fixinc/fixinc.svr4
@@ -1767,12 +1767,12 @@ chmod a+r ${LIB}/sys/byteorder.h
 
 done
 
-if [ x${INSTALL_ASSERT_H} != x ] ;
+if [ x${INSTALL_ASSERT_H} != x ]
 then
   cd ${ORIG_DIR}
-  rm -f include/assert.h;
-  cp $(srcdir)/assert.h include/assert.h;
-  chmod a+r include/assert.h;
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
 fi
 
 exit 0
diff --git a/gcc/fixinc/fixinc.winnt b/gcc/fixinc/fixinc.winnt
index 7b8fe9e..cb7e72f 100644
--- a/gcc/fixinc/fixinc.winnt
+++ b/gcc/fixinc/fixinc.winnt
@@ -229,12 +229,12 @@ for file in $files; do
   rmdir $LIB/$file > NUL 2>&1
 done
 
-if [ x${INSTALL_ASSERT_H} != x ] ;
+if [ x${INSTALL_ASSERT_H} != x ]
 then
   cd ${ORIG_DIR}
-  rm -f include/assert.h;
-  cp $(srcdir)/assert.h include/assert.h;
-  chmod a+r include/assert.h;
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
 fi
 
 exit 0
diff --git a/gcc/fixinc/fixinc.wrap b/gcc/fixinc/fixinc.wrap
index ac9b5c9..0c27536 100755
--- a/gcc/fixinc/fixinc.wrap
+++ b/gcc/fixinc/fixinc.wrap
@@ -133,12 +133,12 @@ fi
 
 done
 
-if [ x${INSTALL_ASSERT_H} != x ] ;
+if [ x${INSTALL_ASSERT_H} != x ]
 then
   cd ${ORIG_DIR}
-  rm -f include/assert.h;
-  cp $(srcdir)/assert.h include/assert.h;
-  chmod a+r include/assert.h;
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
 fi
 
 exit 0
diff --git a/gcc/fixinc/fixinc.x86-linux-gnu b/gcc/fixinc/fixinc.x86-linux-gnu
index 679933a..1bee37d 100644
--- a/gcc/fixinc/fixinc.x86-linux-gnu
+++ b/gcc/fixinc/fixinc.x86-linux-gnu
@@ -136,12 +136,12 @@ __EOF__
 # the real <gnu/types.h>.
 chmod a+r $LIB/$file
 
-if [ x${INSTALL_ASSERT_H} != x ] ;
+if [ x${INSTALL_ASSERT_H} != x ]
 then
   cd ${ORIG_DIR}
-  rm -f include/assert.h;
-  cp $(srcdir)/assert.h include/assert.h;
-  chmod a+r include/assert.h;
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
 fi
 
 exit 0