From abe8d6774e1dae1a06c1d6b383e9dae4824143b8 Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Sun, 24 Oct 2004 11:54:03 +0000 Subject: [PATCH] _docdir is an external variable used in build.sh and pkgdef so changing it halfway through is very bad. Fixed. This frequently caused ./build.sh install pack to break because _docdir is redefined between the 2 steps. --- buildpkg.functions | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/buildpkg.functions b/buildpkg.functions index 2d07dd5..94430ed 100644 --- a/buildpkg.functions +++ b/buildpkg.functions @@ -434,20 +434,22 @@ compress_info() doc() { local f + local ddir # Holds internal value of _docdir + if [ ! -z $# ]; then setdir source if [ "$shortroot" -eq 1 ]; then - _docdir=$stagedir/$_docdir/$topdir-$version + ddir=$stagedir/$_docdir/$topdir-$version else - _docdir=$stagedir/$prefix/$_docdir/$topdir-$version + ddir=$stagedir/$prefix/$_docdir/$topdir-$version fi - mkdir -p $_docdir + mkdir -p $dddir echo "Adding docs" until [ -z "$1" ] do for f in $(_upls $1) do - ($TAR -cf - "$f")|(cd $_docdir; $TAR -xvBpf -) + ($TAR -cf - "$f")|(cd $ddir; $TAR -xvBpf -) done shift done