Changeset 9256309 for chapter06

Timestamp:

03/14/2014 07:43:05 PM (11 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.6-systemd, 7.7-systemd, 7.8-systemd, 7.9-systemd

Children:

f6125f3

Parents:

a7b7506

Message:

Merge lfs svn.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10509 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter06

Files:

• bash.xml (modified) (1 diff)
• creatingdirs.xml (modified) (1 diff)
• linux-headers.xml (modified) (1 diff)
• readline.xml (modified) (2 diffs)

chapter06/bash.xml

@@ -40 +40 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
-
+<!--
     <para>First, apply the following patch to fix various bugs that have been
     addressed upstream:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
-
+-->
     <para>Prepare Bash for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr                     \
-            --bindir=/bin                     \
-            --htmldir=/usr/share/doc/bash-&bash-version; \
-            --without-bash-malloc             \
+<screen><userinput remap="configure">./configure --prefix=/usr                    \
+            --bindir=/bin                    \
+            --docdir=/usr/share/doc/bash-&bash-version; \
+            --without-bash-malloc            \
             --with-installed-readline</userinput></screen>
 

chapter06/creatingdirs.xml

@@ -25 +25 @@
 
 case $(uname -m) in
- x86_64) ln -sv lib /lib64     && 
-         ln -sv lib /usr/lib64 && 
+ x86_64) ln -sv lib /lib64
+         ln -sv lib /usr/lib64
          ln -sv lib /usr/local/lib64 ;;
 esac

chapter06/linux-headers.xml

@@ -60 +60 @@
     the intermediate directory.</para>
 
-<screen><userinput remap="make">make headers_check
-make INSTALL_HDR_PATH=dest headers_install
+<screen><userinput remap="make">make INSTALL_HDR_PATH=dest headers_install
 find dest/include \( -name .install -o -name ..install.cmd \) -delete
 </userinput><userinput remap="install">cp -rv dest/include/* /usr/include</userinput></screen>

chapter06/readline.xml

@@ -50 +50 @@
 sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
 
-    <para>Apply a patch to fix a known bug that has been fixed upstream:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
-
     <para>Prepare Readline for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/readline-&readline-version; </userinput></screen>
 
     <para>Compile the package:</para>
@@ -91 +87 @@
     <para>If desired, install the documentation:</para>
 
-<screen><userinput remap="install">mkdir   -v /usr/share/doc/readline-&readline-version;
-install -v -m644 doc/*.{ps,pdf,html,dvi} /usr/share/doc/readline-&readline-version;</userinput></screen>
+<screen><userinput remap="install">install -v -m644 doc/*.{ps,pdf,html,dvi} /usr/share/doc/readline-&readline-version;</userinput></screen>
 
   </sect2>