[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-3.0.0-systemd-130-gfc46d00

[git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, master has been updated
       via  fc46d00386fe5b391fe7e35d721c4e776b7628c1 (commit)
      from  948a6a4a96913f43b6cf4fa83ab22acf30c27089 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fc46d00386fe5b391fe7e35d721c4e776b7628c1
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Fri Sep 4 21:14:16 2015 -0500

    Remove install of Attr an-pages since the man-pages package installs them.

diff --git a/BOOK/final-system/common/attr.xml b/BOOK/final-system/common/attr.xml
index 5946393..ef8997c 100644
--- a/BOOK/final-system/common/attr.xml
+++ b/BOOK/final-system/common/attr.xml
@@ -25,6 +25,11 @@
   <sect2 role="installation">
     <title>Installation of Attr</title>
 
+    <para os="s1">Apply a sed which prevents man-pages which were installed by
+    the <xref linkend="man-pages"/> package:</para>
+
+<screen os="s2"><userinput>sed -i -e "/SUBDIRS/s|man2||" man/Makefile</userinput></screen>
+
     <para os="a">Apply a sed to install the documentation with a versioned
     directory:</para>
 
diff --git a/BOOK/final-system/multilib/attr-64bit.xml b/BOOK/final-system/multilib/attr-64bit.xml
index 93d88f4..10ff47e 100644
--- a/BOOK/final-system/multilib/attr-64bit.xml
+++ b/BOOK/final-system/multilib/attr-64bit.xml
@@ -23,6 +23,14 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='s1'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='s2'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/attr-n32.xml b/BOOK/final-system/multilib/attr-n32.xml
index 73487f8..b62481d 100644
--- a/BOOK/final-system/multilib/attr-n32.xml
+++ b/BOOK/final-system/multilib/attr-n32.xml
@@ -24,6 +24,14 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='s1'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='s2'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/attr.xml b/BOOK/final-system/multilib/attr.xml
index d10c1a8..43bd025 100644
--- a/BOOK/final-system/multilib/attr.xml
+++ b/BOOK/final-system/multilib/attr.xml
@@ -24,6 +24,14 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='s1'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='s2'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

-----------------------------------------------------------------------

Summary of changes:
 BOOK/final-system/common/attr.xml         |    5 +++++
 BOOK/final-system/multilib/attr-64bit.xml |    8 ++++++++
 BOOK/final-system/multilib/attr-n32.xml   |    8 ++++++++
 BOOK/final-system/multilib/attr.xml       |    8 ++++++++
 4 files changed, 29 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book