Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: merged Makefile fixes



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



Messages sorted by: Reverse Date, Date, Thread, Author