From: Peter Stephenson <pws@csr.com>
To: zsh-workers@sunsite.auc.dk (Zsh hackers list)
Subject: Re: PATCH: function install
Date: Mon, 04 Dec 2000 19:12:42 +0000 [thread overview]
Message-ID: <0G5200H255D5QL@la-la.cambridgesiliconradio.com> (raw)
In-Reply-To: "Your message of Mon, 04 Dec 2000 10:47:36 GMT." <0G510002YHZB9B@la-la.cambridgesiliconradio.com>
I nearly wrote:
> Yow! I have seen the SUBDIRS!
This should fix it, with the change that Completion is now installed as a
subdirectory under ..../functions. I've even tested it this time.
The first hunk is tangentially related paranoia; the second got missed out
the first time round.
Index: configure.in
===================================================================
RCS file: /cvsroot/zsh/zsh/configure.in,v
retrieving revision 1.35
diff -u -r1.35 configure.in
--- configure.in 2000/11/30 18:36:21 1.35
+++ configure.in 2000/12/04 19:07:26
@@ -1744,7 +1744,7 @@
grep "^name=$name " ${CONFIG_MODULES}.old
;;
*) case "$link" in
- *\ *) eval 'link=`'$link'`'
+ *\ *) eval "link=\`$link\`"
;;
esac
case "${load}" in
Index: Config/defs.mk.in
===================================================================
RCS file: /cvsroot/zsh/zsh/Config/defs.mk.in,v
retrieving revision 1.3
diff -u -r1.3 defs.mk.in
--- Config/defs.mk.in 2000/11/26 20:01:02 1.3
+++ Config/defs.mk.in 2000/12/04 19:07:26
@@ -74,7 +74,6 @@
INSTALL_DATA = @INSTALL_DATA@
# variables used in determining what to install
-FUNCTIONS_INSTALL = @FUNCTIONS_INSTALL@
FUNCTIONS_SUBDIRS = @FUNCTIONS_SUBDIRS@
# flags passed to recursive makes in subdirectories
Index: Config/installfns.sh
===================================================================
RCS file: /cvsroot/zsh/zsh/Config/installfns.sh,v
retrieving revision 1.3
diff -u -r1.3 installfns.sh
--- Config/installfns.sh 2000/12/04 12:02:31 1.3
+++ Config/installfns.sh 2000/12/04 19:07:26
@@ -14,8 +14,7 @@
for file in $allfuncs; do
if test -f $sdir_top/$file; then
if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then
- subdir="`echo $file | sed -e 's%/[^/]*$%%' \
- -e s%^Functions/%% -e s%^Completion/%%`"
+ subdir="`echo $file | sed -e 's%/[^/]*$%%' -e 's%^Functions/%%'`"
instdir="$fndir/$subdir"
else
instdir="$fndir"
Index: Config/uninstallfns.sh
===================================================================
RCS file: /cvsroot/zsh/zsh/Config/uninstallfns.sh,v
retrieving revision 1.2
diff -u -r1.2 uninstallfns.sh
--- Config/uninstallfns.sh 2000/11/30 18:36:23 1.2
+++ Config/uninstallfns.sh 2000/12/04 19:07:26
@@ -24,7 +24,7 @@
for file in $allfuncs; do
if test -f $sdir_top/$file; then
if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then
- file=`echo $file | sed -e 's%%^Completion/%' -e 's%%^Functions%'`
+ file=`echo $file | sed -e 's%%^Functions/%'`
rm -f $fndir/$file;
else
bfile="`echo $file | sed -e 's%^.*/%%'`"
Index: Src/zsh.mdd
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/zsh.mdd,v
retrieving revision 1.5
diff -u -r1.5 zsh.mdd
--- Src/zsh.mdd 2000/11/30 18:36:23 1.5
+++ Src/zsh.mdd 2000/12/04 19:07:27
@@ -45,10 +45,13 @@
echo '#define FPATH_DIR "'$(fndir)'"' >> zshpaths.h.tmp; \
if test x$(FUNCTIONS_SUBDIRS) != x -a \
x$(FUNCTIONS_SUBDIRS) != xno; then \
- fpath_tmp="`for f in $$FUNCTIONS_INSTALL; do \
- echo $$f | sed s%/.*%%; \
- done | sort | uniq`"; \
- fpath_tmp="`echo $$fpath_tmp | sed 's/ /\", \"/g'`"; \
+ fpath_tmp="`grep ' functions=.' \
+ $(dir_top)/config.modules | sed -e '/^#/d' -e '/ link=no/d' \
+ -e 's/^.* functions=//'`"; \
+ fpath_tmp=`for f in $$fpath_tmp; do \
+ echo $$f | sed -e 's%^Functions/%%' -e 's%/[^/]*$$%%'; \
+ done | sort | uniq`; \
+ fpath_tmp=`echo $$fpath_tmp | sed 's/ /\", \"/g'`; \
echo "#define FPATH_SUBDIRS { \"$$fpath_tmp\" }" \
>>zshpaths.h.tmp; \
fi; \
--
Peter Stephenson <pws@csr.com> Software Engineer
Cambridge Silicon Radio, Unit 300, Science Park, Milton Road,
Cambridge, CB4 0XL, UK Tel: +44 (0)1223 392070
next prev parent reply other threads:[~2000-12-04 19:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2000-11-30 18:28 Peter Stephenson
2000-12-02 23:37 ` Bart Schaefer
2000-12-04 10:47 ` Peter Stephenson
2000-12-04 19:12 ` Peter Stephenson [this message]
2000-12-05 15:18 ` Module config Andrej Borsenkow
2000-12-05 16:35 ` Peter Stephenson
2000-12-05 19:54 ` Andrej Borsenkow
2000-12-06 10:41 ` Peter Stephenson
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=0G5200H255D5QL@la-la.cambridgesiliconradio.com \
--to=pws@csr.com \
--cc=zsh-workers@sunsite.auc.dk \
/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).