--- gcc/fixincludes	2018/04/24 16:55:44	1.1.1.12
+++ gcc/fixincludes	2018/04/24 16:57:45	1.1.1.13
@@ -155,9 +155,34 @@ if [ -r ${LIB}/$file ]; then
   g/boottime$/s//&;/
   wq
 EOF
-  if cmp $file $2/$file >/dev/null 2>&1; then
-    echo Deleting $2/$file\; no fixes were needed.
-    rm $2/$file
+  if cmp $file ${LIB}/$file >/dev/null 2>&1; then
+    echo Deleting ${LIB}/$file\; no fixes were needed.
+    rm ${LIB}/$file
+  fi
+fi
+
+# Check for bad #ifdef line (in Ultrix 4.1)
+
+file=sys/file.h
+if [ -r $file ]; then
+  if [ ! -r ${LIB}/$file ]; then
+    mkdir ${LIB}/rpcsvc 2>&-
+    cp $file ${LIB}/$file >/dev/null 2>&1	\
+    || echo "Can't copy $file"
+    chmod +w ${LIB}/$file
+  fi
+fi
+
+if [ -r ${LIB}/$file ]; then
+  echo Fixing $file, bad #ifdef line
+  ex ${LIB}/$file <<EOF
+  g/^#ifdef KERNEL && !defined/
+  s/#ifdef KERNEL && !defined/#if defined(KERNEL) \&\& !defined/
+  wq
+EOF
+  if cmp $file ${LIB}/$file >/dev/null 2>&1; then
+    echo Deleting ${LIB}/$file\; no fixes were needed.
+    rm ${LIB}/$file
   fi
 fi