diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2013-11-23 17:44:12 +0000 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2013-11-23 17:44:12 +0000 |
| commit | 9503b161ab893a5d5c6ac6f9fdd9e938aee7045c (patch) | |
| tree | e4714911e5d88154a27e1878f0aad2af91585b4a /Config | |
| parent | 8e2d4c2cf77125588549194677a2688a547c1b9e (diff) | |
| download | zsh-9503b161ab893a5d5c6ac6f9fdd9e938aee7045c.tar.gz zsh-9503b161ab893a5d5c6ac6f9fdd9e938aee7045c.tar.xz zsh-9503b161ab893a5d5c6ac6f9fdd9e938aee7045c.zip | |
32031 plus missed _run_help: get helpfiles install path corect in functions
Diffstat (limited to 'Config')
| -rw-r--r-- | Config/defs.mk.in | 1 | ||||
| -rwxr-xr-x | Config/installfns.sh | 22 |
2 files changed, 21 insertions, 2 deletions
diff --git a/Config/defs.mk.in b/Config/defs.mk.in index 58ef11066..5c19cc4d5 100644 --- a/Config/defs.mk.in +++ b/Config/defs.mk.in @@ -51,6 +51,7 @@ sitefndir = @sitefndir@ scriptdir = @scriptdir@ sitescriptdir = @sitescriptdir@ htmldir = @htmldir@ +runhelpdir = @runhelpdir@ # compilation CC = @CC@ diff --git a/Config/installfns.sh b/Config/installfns.sh index cf587c438..149f359c6 100755 --- a/Config/installfns.sh +++ b/Config/installfns.sh @@ -10,6 +10,8 @@ allfuncs="`grep ' functions=.' ${dir_top}/config.modules | allfuncs="`cd $sdir_top; echo ${allfuncs}`" +test -d installfnsdir || mkdir installfnsdir + # We now have a list of files, but we need to use `test -f' to check # (1) the glob got expanded (2) we are not looking at directories. for file in $allfuncs; do @@ -44,8 +46,22 @@ for file in $allfuncs; do ;; esac fi - test -d $instdir || /bin/sh $sdir_top/mkinstalldirs $instdir || exit 1 - $INSTALL_DATA $sdir_top/$file $instdir || exit 1 + basename=`basename $file` + ok=0 + if test -d $instdir || /bin/sh $sdir_top/mkinstalldirs $instdir; then + if sed "s|@runhelpdir@|$runhelpdir|" <$sdir_top/$file \ + >installfnsdir/$basename; then + if $INSTALL_DATA installfnsdir/$basename $instdir; then + ok=1 + fi + fi + fi + case $ok in + 0) + rm -rf installfnsdir + exit 1 + ;; + esac read line < $sdir_top/$file case "$line" in '#!'*) @@ -54,3 +70,5 @@ for file in $allfuncs; do esac fi done + +rm -rf installfnsdir |