From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-request@euclid.skiles.gatech.edu>
Received: (qmail 3066 invoked from network); 2 Jan 1997 16:20:01 -0000
Received: from euclid.skiles.gatech.edu (list@130.207.146.50)
  by coral.primenet.com.au with SMTP; 2 Jan 1997 16:20:01 -0000
Received: (from list@localhost) by euclid.skiles.gatech.edu (8.7.3/8.7.3) id LAA02902; Thu, 2 Jan 1997 11:17:16 -0500 (EST)
Resent-Date: Thu, 2 Jan 1997 11:17:16 -0500 (EST)
From: Zoltan Hidvegi <hzoli@cs.elte.hu>
Message-Id: <199701021618.RAA10503@bolyai.cs.elte.hu>
Subject: Re: merged Makefile fixes
In-Reply-To: <1407.199701021433@stone.dcs.warwick.ac.uk> from Zefram at "Jan 2, 97 02:33:03 pm"
To: zefram@dcs.warwick.ac.uk (Zefram)
Date: Thu, 2 Jan 1997 17:18:19 +0100 (MET)
Cc: zsh-workers@math.gatech.edu
Organization: Dept. of Comp. Sci., Eotvos University, Budapest, Hungary
Phone: (36 1)2669833 ext: 2667, home phone: (36 1) 2752368
X-Mailer: ELM [version 2.4ME+ PL27 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Resent-Message-ID: <"xQsEv1.0.Ej.B-zoo"@euclid>
Resent-From: zsh-workers@math.gatech.edu
X-Mailing-List: <zsh-workers@math.gatech.edu> archive/latest/2704
X-Loop: zsh-workers@math.gatech.edu
Precedence: list
Resent-Sender: zsh-workers-request@math.gatech.edu

Zefram wrote:
> This patch does what my patch 2696 does, but applies on top of Zoltan's
> patch 2694.  Please use this *instead of* patch 2696.

And after that also apply the patch below.  ${...:-...} is not supported by
old shells.  It alse moves an exit out from a subshell.

Zoltan


diff -c Src/mkbltnmlst.sh.zefram Src/mkbltnmlst.sh
*** Src/mkbltnmlst.sh.zefram	Thu Jan  2 16:14:57 1997
--- Src/mkbltnmlst.sh	Thu Jan  2 16:32:18 1997
***************
*** 4,11 ****
  #
  # Written by Andrew Main
  #
! srcdir=${srcdir:-`echo $0|sed 's%/[^/][^/]*$%%'`}
! srcdir=${srcdir:-.}
  CFSED=${CFSED-"-f $srcdir/conf.sed"}
  MODBINS=${MODBINS-modules-bltin}
  XMODCF=${XMODCF-$srcdir/xmods.conf}
--- 4,12 ----
  #
  # Written by Andrew Main
  #
! srcdir=${srcdir-`echo $0|sed 's%/[^/][^/]*$%%'`}
! test "x$srcdir" = "x$0" && srcdir=.
! test "x$srcdir" = "x"   && srcdir=.
  CFSED=${CFSED-"-f $srcdir/conf.sed"}
  MODBINS=${MODBINS-modules-bltin}
  XMODCF=${XMODCF-$srcdir/xmods.conf}
diff -c Src/mkstamp.sh.zefram Src/mkstamp.sh
*** Src/mkstamp.sh.zefram	Thu Jan  2 15:58:47 1997
--- Src/mkstamp.sh	Thu Jan  2 16:32:15 1997
***************
*** 4,15 ****
  #
  # Written by Andrew Main
  #
! srcdir=${srcdir:-`echo $0|sed 's%/[^/][^/]*$%%'`}
! srcdir=${srcdir:-.}
  CFSED=${CFSED-"-f $srcdir/conf.sed"}
  MODBINS=${MODBINS-modules-bltin}
  MODCF=${MODCF-$srcdir/mods.conf}
! MODULE_DIRS=${MODULE_DIRS-Modules Zle}
  MAKE=${MAKE-make}
  STMP=$1
  
--- 4,16 ----
  #
  # Written by Andrew Main
  #
! srcdir=${srcdir-`echo $0|sed 's%/[^/][^/]*$%%'`}
! test "x$srcdir" = "x$0" && srcdir=.
! test "x$srcdir" = "x"   && srcdir=.
  CFSED=${CFSED-"-f $srcdir/conf.sed"}
  MODBINS=${MODBINS-modules-bltin}
  MODCF=${MODCF-$srcdir/mods.conf}
! MODULE_DIRS=${MODULE_DIRS-'Modules Zle'}
  MAKE=${MAKE-make}
  STMP=$1
  
***************
*** 38,45 ****
      fi
      bdir=`echo $objs | sed 's, .*$,,;s,^,./,;s,/[^/]*$,,'`
      bobjs=`echo '' $objs | sed 's, [^ ]*/, ,g'`
!     ( cd $bdir && eval "$MAKE $MAKEDEFS EXTRA_BUILDACT=\"\$act\" \$bobjs" ||
! 	{ rm -f $STMP.tmp; exit 1; } )
      echo $objs >> $STMP.tmp
  done
  if cmp -s $STMP.tmp $STMP; then
--- 39,46 ----
      fi
      bdir=`echo $objs | sed 's, .*$,,;s,^,./,;s,/[^/]*$,,'`
      bobjs=`echo '' $objs | sed 's, [^ ]*/, ,g'`
!     (cd $bdir && eval "$MAKE $MAKEDEFS EXTRA_BUILDACT=\"\$act\" \$bobjs") ||
! 	{ rm -f $STMP.tmp; exit 1; }
      echo $objs >> $STMP.tmp
  done
  if cmp -s $STMP.tmp $STMP; then