diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2014-02-17 04:59:10 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2014-02-17 04:59:10 +0000 |
| commit | 177aee0f061bfceafa797ec433925146bff6b431 (patch) | |
| tree | 4cb283fb35714b5924fa639a06cb1a39690d2efe | |
| parent | d02c56d5f5dc1d2a8bea323b95acb48cb940051e (diff) | |
Delete unneded symlinks in /usr; add /usr/libexec.
Use better workarund for automake tests.
Minor spacing issues.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10476 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 1 | ||||
| -rw-r--r-- | chapter06/automake.xml | 7 | ||||
| -rw-r--r-- | chapter06/creatingdirs.xml | 4 | ||||
| -rw-r--r-- | chapter06/flex.xml | 2 |
4 files changed, 5 insertions, 9 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 57893afdc..929bad666 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -80,6 +80,7 @@ </listitem> </itemizedlist> </listitem> + <listitem> <para>2014-02-14</para> <itemizedlist> diff --git a/chapter06/automake.xml b/chapter06/automake.xml index e4c862f4e..d02700a27 100644 --- a/chapter06/automake.xml +++ b/chapter06/automake.xml @@ -55,11 +55,8 @@ systems with only one processor due to internal delays in individual tests. To test the results, issue:</para> -<screen><userinput remap="test">mv -v /usr/lib/libfl.{so,save} -ln -sv libfl.a /usr/lib/libfl.so -make -j4 check -rm -v /usr/lib/libfl.so -mv -v /usr/lib/libfl.{save,so}</userinput></screen> +<screen><userinput remap="test">sed -i "s:./configure:LEXLIB=/usr/lib/libfl.a &:" t/lex-{clean,depend}-cxx.sh +make -j4 check</userinput></screen> <para>Install the package:</para> diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml index 9a3713ebf..5443326a9 100644 --- a/chapter06/creatingdirs.xml +++ b/chapter06/creatingdirs.xml @@ -20,10 +20,8 @@ install -dv -m 1777 /tmp /var/tmp mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src} mkdir -pv /usr/{,local/}share/{color,dict,doc,info,locale,man} mkdir -v /usr/{,local/}share/{misc,terminfo,zoneinfo} +mkdir -v /usr/libexec mkdir -pv /usr/{,local/}share/man/man{1..8} -for dir in /usr /usr/local; do - ln -sv share/{man,doc,info} $dir -done case $(uname -m) in x86_64) ln -sv lib /lib64 && ln -sv lib /usr/lib64 && ln -sv lib /usr/local/lib64 ;; esac diff --git a/chapter06/flex.xml b/chapter06/flex.xml index 45364de3f..6b4d42363 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -47,7 +47,7 @@ <para>Prepare Flex for compilation:</para> -<screen><userinput remap="configure">./configure --prefix=/usr \ +<screen><userinput remap="configure">./configure --prefix=/usr \ --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen> <para>Compile the package:</para> |