Changeset c1626d8 for common

Timestamp:

12/24/2013 06:52:24 PM (11 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

cbca63a

Parents:

65d7d46

Message:

Adapt blfs installation to recent changes in BLFS book

File:

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

common/libs/func_install_blfs

@@ -64 +64 @@
   LINE_TIDY='#CONFIG_html-tidy is not set'
 fi
-if [ "$DEP_DBXML" = y ]; then
-  LINE_DBXML='CONFIG_DocBook=y'
-else
-  LINE_DBXML='#CONFIG_DocBook is not set'
-fi
+# DocBook is a rec dep of libxslt
+# if [ "$DEP_DBXML" = y ]; then
+#   LINE_DBXML='CONFIG_DocBook=y'
+# else
+#   LINE_DBXML='#CONFIG_DocBook is not set'
+# fi
 if [ "$DEP_LYNX" = y ]; then
   LINE_LYNX='CONFIG_lynx=y'
@@ -110 +111 @@
 $LINE_LIBXSLT
 $LINE_TIDY
-$LINE_DBXML
 $LINE_OPENSSL
 $LINE_WGET
@@ -147 +147 @@
 
 # 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.
+  sed -i '\@^[[:space:]]*/etc/xml/catalog$@{
+n
+:a
+\@/etc/xml/catalog$@bb
+N
+ba
+:b
+d}' \
+      $BUILDDIR$BLFS_ROOT/scripts/*docbook-xsl
+fi
 if [ "$DEP_SUDO" = y ]; then
   sed -i '/pam.d/i mkdir -p /etc/pam.d' $BUILDDIR$BLFS_ROOT/scripts/*sudo