Changeset cbca63a

Timestamp:

12/25/2013 11:26:55 AM (10 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

94744cd

Parents:

c1626d8

Message:

Further changes to BLFS tools installation

File:

• common/libs/func_install_blfs (modified) (3 diffs)

common/libs/func_install_blfs

@@ -148 +148 @@
 # Suppresses unneeded parts of the scriptlets
 if [ "$DEP_LIBXSLT" = y ]; then
-  # libxslt pulls docbook-xsl in. Sorry for sed synthax.
-  # I do not know how to delete lines between 2 addresses excluding those
-  # two lines.
+  # libxslt pulls docbook-xsl in, which populates the catalog with annoying
+  # **EDITME** references. Fortunately, those lines are regognizable because
+  # they occur between lines containing '/etc/xml/catalog' at the end of the
+  # line (without '&&'). I  have not found a simple way to delete lines
+  # between 2 addresses, excluding either the first or the last one. So use
+  # a loop for accumulating lines and deleting at the end.
+  # Sorry for sed synthax.
   sed -i '\@^[[:space:]]*/etc/xml/catalog$@{
 n
@@ -162 +166 @@
 fi
 if [ "$DEP_SUDO" = y ]; then
-  sed -i '/pam.d/i mkdir -p /etc/pam.d' $BUILDDIR$BLFS_ROOT/scripts/*sudo
+  sed -i '/cat.*pam.d/i mkdir -p /etc/pam.d' $BUILDDIR$BLFS_ROOT/scripts/*sudo
 fi
 if [ "$DEP_SVN" = y ]; then
@@ -178 +182 @@
 pushd $BUILDDIR$BLFS_ROOT/work
 ../gen-makefile.sh
+# The generated Makefile updates the tracking file after each package
+# installation, using libxslt, which is not installed yet. So move
+# updating to the end of the process, adding an 'update' target
 sed -i -e '/xsltproc/,+6d' \
        -e '/^all/s@$@ update@' \