Changeset 9da16d9

Timestamp:

03/19/2017 04:17:18 PM (7 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, trunk

Children:

c7c32a3

Parents:

3aa1acd

Message:

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.

Files:

• BLFS/xsl/scripts.xsl (modified) (1 diff)
• common/libs/func_install_blfs (modified) (1 diff)

BLFS/xsl/scripts.xsl

@@ -146 +146 @@
      UNPACKDIR=$PKG_DIR-build
      mkdir $UNPACKDIR
-     cp $PACKAGE $UNPACKDIR
+     cp $SRC_DIR/$PACKAGE $UNPACKDIR
+     cp $(find . -mindepth 1 -maxdepth 1 -type l) $UNPACKDIR
      ;;
 esac

common/libs/func_install_blfs

@@ -187 +187 @@
         -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