mkbltnmlst.sh sources directories.

mkbltnmlst.sh sources directories.

[Tanaka Akira]

mkbltnmlst.sh sources directories as:

make[1]: Entering directory `/home/akr/src/zsh/cvs/zsh/Src'
srcdir='.' MODBINS='modules-bltin' \
XMODCF='./xmods.conf' /bin/sh ./mkbltnmlst.sh bltinmods.list
./mkbltnmlst.sh: .: ./../: is a directory
...

Note that this result is on linux.  On Solaris 7, /bin/sh actualy
sources a directory and generates messy errors:

srcdir='.' MODBINS='modules-bltin' \
XMODCF='./xmods.conf' /bin/sh ./mkbltnmlst.sh bltinmods.list
./mkbltnmlst.sh: ^Dku^L^A.^A^F^[^L^B..^Dzl^L^CCVS^Dkv^X^MChangeLog.3.0^Dkw^T: not found
./mkbltnmlst.sh: .cvsignore^Dkx^T: not found
...

Is this fix correct?

Index: mkbltnmlst.sh
===================================================================
RCS file: /projects/zsh/zsh/Src/mkbltnmlst.sh,v
retrieving revision 1.1.1.11
diff -u -r1.1.1.11 mkbltnmlst.sh
--- mkbltnmlst.sh	1999/12/16 14:26:33	1.1.1.11
+++ mkbltnmlst.sh	1999/12/17 13:15:14
@@ -34,6 +34,7 @@
     eval "modfile=\$modfile_$q_x_mod"
     unset moddeps autobins autoinfixconds autoprefixconds autoparams
     unset automathfuncs
+    if [ -f $srcdir/../$modfile ]; then
     . $srcdir/../$modfile
     for bin in $autobins; do
 	echo "    add_autobin(\"$bin\", \"$x_mod\");"
@@ -53,6 +54,7 @@
     for dep in $moddeps; do
 	echo "    add_dep(\"$x_mod\", \"$dep\");"
     done
+    fi
     test "x$linked" = xno && echo "#endif"
 done
 
-- 
Tanaka Akira

Re: mkbltnmlst.sh sources directories.

[Zefram]

Tanaka Akira wrote:
>mkbltnmlst.sh sources directories as:
>
>make[1]: Entering directory `/home/akr/src/zsh/cvs/zsh/Src'
>srcdir='.' MODBINS='modules-bltin' \
>XMODCF='./xmods.conf' /bin/sh ./mkbltnmlst.sh bltinmods.list
>./mkbltnmlst.sh: .: ./../: is a directory

This shouldn't be happening.

>+    if [ -f $srcdir/../$modfile ]; then
>     . $srcdir/../$modfile

Clearly, $modfile is empty here.  That indicates that xmods.conf lists a
module that doesn't exist (or at least isn't in the module index).  Do you
perhaps need to do a "make prep", having applied my module names patch?

Your patch shouldn't be used, I think.  $modfile being blank here is an
error; if it is to be detected, then an error message should be generated.

-zefram

Re: mkbltnmlst.sh sources directories.

[Tanaka Akira]

In article <E11yxV5-0007vV-00@crucigera.fysh.org>,
  Zefram <zefram@fysh.org> writes:

> This shouldn't be happening.

I see.

> Clearly, $modfile is empty here.  That indicates that xmods.conf lists a
> module that doesn't exist (or at least isn't in the module index).  Do you
> perhaps need to do a "make prep", having applied my module names patch?

Yes. $modfile is empty because xmods.conf has `cap' by 9084 and
modules.index has no `modfile_cap=...'.

Do I miss some patches?

> Your patch shouldn't be used, I think.  $modfile being blank here is an
> error; if it is to be detected, then an error message should be generated.

Ok. I reverted my patch.
-- 
Tanaka Akira