Fix a bug in the blfs scripts, occuring when the pacakge is neither a

tarball nor a zip file: copy the package from $SRC_DIR to the xxx-build dir.
And in case they are needed, copy the additional files too.
This commit is contained in:
Pierre Labastie 2017-03-19 16:17:18 +00:00
parent 3aa1acdc0d
commit 9da16d9bf1
2 changed files with 2 additions and 7 deletions

View file

@ -145,7 +145,8 @@ case $PACKAGE in
*)
UNPACKDIR=$PKG_DIR-build
mkdir $UNPACKDIR
cp $PACKAGE $UNPACKDIR
cp $SRC_DIR/$PACKAGE $UNPACKDIR
cp $(find . -mindepth 1 -maxdepth 1 -type l) $UNPACKDIR
;;
esac
cd $UNPACKDIR


View file

@ -187,12 +187,6 @@ if [ "$DEP_LYNX" = y ]; then
-i $BUILDDIR$BLFS_ROOT/scripts/*lynx
fi
fi
# The book instructions for CA certificates suppose that the cerdata.txt
# file is in the same directory as make-ca.sh-<version>. This is not the
# case with our default instructions. Just remove the "cd $UNPACKDIR" here.
if test -f $BUILDDIR$BLFS_ROOT/scripts/*cacerts; then
sed -i '/cd \$UNPACKDIR/d' $BUILDDIR$BLFS_ROOT/scripts/*cacerts
fi
# At last generates the build Makefile
mkdir -p $BUILDDIR$BLFS_ROOT/work
pushd $BUILDDIR$BLFS_ROOT/work