Update of /cvsroot/winbash/winbash/support
In directory usw-pr-cvs1:/tmp/cvs-serv14844/support
Modified Files:
bashbug.sh mksysdefs
Log Message:
Applied 1.14.3 diffs from GNU bash
Index: bashbug.sh
===================================================================
RCS file: /cvsroot/winbash/winbash/support/bashbug.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bashbug.sh 9 Mar 2002 04:43:16 -0000 1.2
+++ bashbug.sh 9 Mar 2002 16:05:44 -0000 1.3
@@ -17,7 +17,7 @@
TEMP=/tmp/bashbug.$$
-BUGADDR=${1:-bu...@pr...}
+BUGADDR=${1-b...@pr...}
: ${EDITOR=emacs}
@@ -29,7 +29,16 @@
UN=`uname -a`
fi
+if [ -f /usr/lib/sendmail ] ; then
+ RMAIL="/usr/lib/sendmail -t"
+elif [ -f /usr/sbin/sendmail ] ; then
+ RMAIL="/usr/sbin/sendmail -t"
+else
+ RMAIL=rmail
+fi
+
cat > $TEMP <<EOF
+From: ${USER}
To: ${BUGADDR}
Subject: [50 character or so descriptive subject here (for reference)]
@@ -66,7 +75,7 @@
exit
fi
- rmail $BUGADDR < $TEMP || cat $TEMP >> $HOME/dead.bashbug
+ ${RMAIL} $BUGADDR < $TEMP || cat $TEMP >> $HOME/dead.bashbug
fi
exit 0
Index: mksysdefs
===================================================================
RCS file: /cvsroot/winbash/winbash/support/mksysdefs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mksysdefs 9 Mar 2002 04:43:16 -0000 1.2
+++ mksysdefs 9 Mar 2002 16:05:44 -0000 1.3
@@ -174,6 +174,10 @@
MAKE_ANSI=true
elif [ -d /etc/conf/kconfig.d ] && [ -f /usr/include/sys/limits.h ]; then
SYSDEF="isc386" # This is a 386 running ISC?
+ ISCREL="ISC_$RELEASE"
+ echo "#if !defined ($ISCREL)" >>$sysdefs
+ echo "# define $ISCREL" >>$sysdefs
+ echo "#endif /* $ISCREL */" >>$sysdefs
elif [ -f /etc/xlc.cfg ]; then
if fgrep _IBMR2 /etc/xlc.cfg >/dev/null 2>&1; then
SYSDEF=RISC6000
@@ -241,16 +245,9 @@
# What release of SCO Unix is this?
if [ "$SYSDEF" = "" -a -f /bin/uname ]; then
case `/bin/uname -X 2>/dev/null | grep '^Release' 2>/dev/null` in
- *3.2v4.*) SCOREL=SCOv4 ;;
- *) SCOREL= ;;
+ *3.2v4.*) SYSDEF=SCOv4 ;;
+ *) SYSDEF=SCO ;;
esac
-
- if [ "$SCOREL" ]; then
- echo "" >>$sysdefs
- echo "#if !defined ($SCOREL)" >>$sysdefs
- echo "# define $SCOREL" >>$sysdefs
- echo "#endif /* !$SCOREL */" >>$sysdefs
- fi
fi
#
|
