(sys/spinlock.h): Don't copy it if it doesn't exist.

(DPS/XDPSlib.h): Change "XDPS.h" to <DPS/XDPS.h>, for AIX.

From-SVN: r5701

diff --git a/gcc/fixincludes b/gcc/fixincludes
index 3731319c0bb4961954c736c571ffadac1a81367b..79473e0fe958e8cbdb11072036c1fc2fa0ec6510 100755 (executable)
--- a/gcc/fixincludes
+++ b/gcc/fixincludes
@@ -462,7 +462,7 @@ fi
 # Fix HP's use of ../machine/inline.h to refer to
 # /usr/include/machine/inline.h
 file=sys/spinlock.h
-if [ ! -r ${LIB}/$file ] ; then
+if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
   cp $file ${LIB}/$file
 fi
 if [ -r ${LIB}/$file ] ; then
@@ -476,6 +476,20 @@ if [ -r ${LIB}/$file ] ; then
   fi
 fi
 
+# Fix AIX use of "XDPS.h" to refer to <DPS/XDPS.h>
+file=DPS/XDPSlib.h
+if [-r $file] && [ ! -r ${LIB}/$file ] ; then
+  cp $file ${LIB}/$file
+fi
+if [ -r ${LIB}/$file ] ; then
+  echo Fixing $file
+  sed -e 's,"XDPS.h",<DPS/XDPS.h>,' ${LIB}/$file > ${LIB}/${file}.sed
+  rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
+  if cmp $file ${LIB}/$file >/dev/null 2>&1; then
+    rm ${LIB}/$file
+  fi
+fi
+
 # Fix an error in this file: the #if says _cplusplus, not the double
 # underscore __cplusplus that it should be
 file=tinfo.h