Missing merges from fixincl-branch

From-SVN: r25725

gcc/ChangeLog

+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

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

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

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

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

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

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

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

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