From: Zoltan Hidvegi <hzoli@cs.elte.hu>
To: zefram@dcs.warwick.ac.uk (Zefram)
Cc: zsh-workers@math.gatech.edu
Subject: Re: merged Makefile fixes
Date: Thu, 2 Jan 1997 17:18:19 +0100 (MET) [thread overview]
Message-ID: <199701021618.RAA10503@bolyai.cs.elte.hu> (raw)
In-Reply-To: <1407.199701021433@stone.dcs.warwick.ac.uk> from Zefram at "Jan 2, 97 02:33:03 pm"
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
next prev parent reply other threads:[~1997-01-02 16:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
1997-01-02 14:33 Zefram
1997-01-02 16:18 ` Zoltan Hidvegi [this message]
1997-01-02 18:55 ` Zoltan Hidvegi
1997-01-03 11:02 ` Zefram
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=199701021618.RAA10503@bolyai.cs.elte.hu \
--to=hzoli@cs.elte.hu \
--cc=zefram@dcs.warwick.ac.uk \
--cc=zsh-workers@math.gatech.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).