--- gcc-common-1.2/gccbug.orig	2002-01-31 22:36:23 +0300
+++ gcc-common-1.2/gccbug	2002-11-27 17:35:51 +0300
@@ -31,7 +31,7 @@
 GNATS_ADDR=gcc-gnats@gcc.gnu.org
 
 # The default release for this host.
-DEFAULT_RELEASE="@gcc_version_full@"
+DEFAULT_RELEASE="`gcc -v 2>&1 >/dev/null |sed -ne 's/^gcc version \(.*\)$/\1/p'`"
 
 # The default organization.
 DEFAULT_ORGANIZATION=
@@ -70,29 +70,11 @@
 
 #
 
-if [ -z "$TMPDIR" ]; then
-  TMPDIR=/tmp
-else
-  if [ "`echo $TMPDIR | grep '/$'`" != "" ]; then
-    TMPDIR="`echo $TMPDIR | sed -e 's,/$,,'`"
-  fi
-fi
-
-if [ @have_mktemp_command@ = yes ]; then
-	TEMP0=`mktemp $TMPDIR/poXXXXXX` || exit 1
-	TEMP=`mktemp $TMPDIR/pXXXXXX` || exit 1
-	BAD=`mktemp $TMPDIR/pbadXXXXXX` || exit 1
-	REF=`mktemp $TMPDIR/pfXXXXXX` || exit 1
-	REMOVE_TEMP="rm -f $TEMP0 $TEMP $BAD $REF"
-else
-	TEMPD=$TMPDIR/pd$$
-	TEMP0=$TEMPD/po$$
-	TEMP=$TEMPD/p$$
-	BAD=$TEMPD/pbad$$
-	REF=$TEMPD/pf$$
-	mkdir $TEMPD || exit 1
-	REMOVE_TEMP="rm -rf $TEMPD"
-fi
+TEMP0=`mktemp -t po.XXXXXXXXXX` || exit 1
+TEMP=`mktemp -t p.XXXXXXXXXX` || exit 1
+BAD=`mktemp -t pbad.XXXXXXXXXX` || exit 1
+REF=`mktemp -t pf.XXXXXXXXXX` || exit 1
+REMOVE_TEMP="rm -f $TEMP0 $TEMP $BAD $REF"
 
 # find a user name
 if [ "$LOGNAME" = "" ]; then
@@ -148,7 +130,7 @@
 ARCH=`[ -f /bin/arch ] && /bin/arch`
 MACHINE=`[ -f /bin/machine ] && /bin/machine`
 
-COMMAND=`echo $0 | sed -e 's,.*/,,'`
+COMMAND="${0##*/}"
 USAGE="Usage: $COMMAND [-PVL] [-t address] [-f filename] [-s severity]
        [-c address] [--request-id] [--version]"
 REMOVE=
@@ -341,10 +323,10 @@
 `[ -n "$ARCH" ] && echo Architecture: $ARCH`
 `[ -n "$MACHINE" ] && echo Machine: $MACHINE`
 	$ENVIRONMENT_C
-host: @host@
-build: @build@
-target: @target@
-configured with: @gcc_config_arguments@
+host: @TARGET@-gnu
+build: @TARGET@-gnu
+target: @TARGET@-gnu
+configured with: `gcc -v 2>&1 >/dev/null |sed -ne 's/^Configured with: \(.*\)$/\1/p'`
 >Description:
 	$DESCRIPTION_C
 >How-To-Repeat: