From 16b7176600e8a415b22b327d0201759a1bdc9d70 Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Wed, 26 Nov 2003 22:48:16 +0000
Subject: merge latest (4.3.99.16) from XFree86 (vendor) branch

---
 gccmdep.cpp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/gccmdep.cpp b/gccmdep.cpp
index 4578b71..8f39d0d 100644
--- a/gccmdep.cpp
+++ b/gccmdep.cpp
@@ -3,29 +3,21 @@ XCOMM!/bin/sh
 XCOMM
 XCOMM makedepend which uses 'gcc -M'
 XCOMM
-XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.10 2002/11/25 14:04:48 eich Exp $
+XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.11 2003/06/15 16:53:11 tsi Exp $
 XCOMM
 XCOMM Based on mdepend.cpp and code supplied by Hongjiu Lu <hjl@nynexst.com>
 XCOMM
 
-TMP=${TMPDIR-/tmp}/mdep$$
+TMP=mdep$$.tmp
 CC=CCCMD
 RM=RMCMD
 LN=LNCMD
 MV=MVCMD
 
-XCOMM Security: if $tmp exists exit immediately
-rm -f ${TMP}
-if [ -e ${TMP} ] ; then
-    echo "$0: ${TMP} exists already, exit." 1>&2
-    exit 1;
-fi
-if [ -n "`type -p mktemp`" ] ; then
-    TMP="`mktemp ${TMP}.XXXXXX`" || exit 1
-fi
+${RM} ${TMP}
 
-trap "$RM ${TMP}*; exit 1" 1 2 15
-trap "$RM ${TMP}*; exit 0" 1 2 13
+trap "${RM} ${TMP}*; exit 1" 1 2 15
+trap "${RM} ${TMP}*; exit 0" 1 2 13
 
 files=
 makefile=
-- 
cgit v1.2.3