Cleanup process should leave source files that we still need

later on untouched

p4raw-id: //depot/metaconfig@31065

diff --git a/U/compline/d_gconvert.U b/U/compline/d_gconvert.U
index d3fbf16..7116a44 100644 (file)
--- a/U/compline/d_gconvert.U
+++ b/U/compline/d_gconvert.U
@@ -22,7 +22,7 @@
 ?RCS: patch36: created by ADO
 ?RCS:
 ?MAKE:d_Gconvert: \
-       Compile cat Inlibc rm_try i_stdlib d_qgcvt run \
+       Compile cat Inlibc rm _o rm_try i_stdlib d_qgcvt run \
        uselongdouble d_longdbl d_PRIgldbl sPRIgldbl
 ?MAKE: -pick add $@ %<
 ?S:d_Gconvert:
@@ -270,7 +270,8 @@ esac
 
 for xxx_convert in $xxx_list; do
        echo "Trying $xxx_convert..."
-       $rm_try
+?X: Do NOT use $rm_try here, as we need to keep try.c
+       $rm -f try try$_o core
        set try -DTRY_$xxx_convert
        if eval $compile; then
                echo "$xxx_convert() found." >&4
@@ -307,4 +308,5 @@ qgcvt) d_Gconvert='qgcvt((x),(n),(b))' ;;
 esac
 
 fi
+$rm_try
 

diff --git a/U/modified/d_union_semun.U b/U/modified/d_union_semun.U
index 02973d2..a98af1f 100644 (file)
--- a/U/modified/d_union_semun.U
+++ b/U/modified/d_union_semun.U
@@ -70,7 +70,8 @@ eval $setvar
 case "$d_sem" in
 $define)
     echo " "
-    $cat > try.h <<END
+?X: use tryh.h instead of try.h because $rm_try cleans up try.*
+    $cat > tryh.h <<END
 #ifndef S_IRUSR
 #   ifdef S_IREAD
 #      define S_IRUSR S_IREAD
@@ -105,7 +106,7 @@ END
 #include <sys/stat.h>
 #include <stdio.h>
 #include <errno.h>
-#include "try.h"
+#include "tryh.h"
 #ifndef errno
 extern int errno;
 #endif
@@ -175,7 +176,7 @@ END
 #include <sys/ipc.h>
 #include <sys/sem.h>
 #include <sys/stat.h>
-#include "try.h"
+#include "tryh.h"
 #include <stdio.h>
 #include <errno.h>
 #ifndef errno
@@ -225,7 +226,6 @@ END
     *)  echo "You cannot use struct semid_ds* for semctl IPC_STAT." >&4
         ;;
     esac
-    $rm_try
     ;;
 *)  val="$undef"
 
@@ -239,4 +239,5 @@ END
     eval $setvar
     ;;
 esac
+$rm_try tryh.h