diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2014-03-12 20:29:13 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2014-03-12 20:29:13 +0000 |
| commit | a57d556dd7482aa9322833b8836fd24d57bf46a9 (patch) | |
| tree | c0e58c6e6b5ba27f7bba520cec1c6e8f70755eb3 /chapter06 | |
| parent | 15458da85629c01c66ee80080b79d41272782b2e (diff) | |
Tweaks to bash docs installation, readline docs installation,
linux-headers, and findutils.
Update to linux-3.13.6.
Update to man-pages-3.62.
Update to txdata-2014a.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10508 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
| -rw-r--r-- | chapter06/bash.xml | 8 | ||||
| -rw-r--r-- | chapter06/findutils.xml | 2 | ||||
| -rw-r--r-- | chapter06/linux-headers.xml | 3 | ||||
| -rw-r--r-- | chapter06/readline.xml | 5 |
4 files changed, 8 insertions, 10 deletions
diff --git a/chapter06/bash.xml b/chapter06/bash.xml index c63b8b715..d19ea1a25 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -47,10 +47,10 @@ --> <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> <variablelist> diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml index 85e95d979..5f0f88e08 100644 --- a/chapter06/findutils.xml +++ b/chapter06/findutils.xml @@ -80,7 +80,7 @@ script also needs to be modified to correct an explicit path:</para> <screen><userinput remap="install">mv -v /usr/bin/find /bin -sed -i 's/find:=${BINDIR}/find:=\/bin/' /usr/bin/updatedb</userinput></screen> +sed -i 's|find:=${BINDIR}|find:=/bin|' /usr/bin/updatedb</userinput></screen> </sect2> diff --git a/chapter06/linux-headers.xml b/chapter06/linux-headers.xml index 9e424516a..996fe9fdf 100644 --- a/chapter06/linux-headers.xml +++ b/chapter06/linux-headers.xml @@ -59,8 +59,7 @@ the kernel developers and not needed by LFS that are removed from 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> diff --git a/chapter06/readline.xml b/chapter06/readline.xml index f8e10c52b..5c0e3caf2 100644 --- a/chapter06/readline.xml +++ b/chapter06/readline.xml @@ -51,7 +51,7 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install</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> @@ -86,8 +86,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libhistory.so ) /usr/lib/libhistory.so</us <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> |