diff options
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter06/iproute2.xml | 20 |
2 files changed, 6 insertions, 18 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index f73601d59..bf4829273 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,6 +43,10 @@ instead of creating a symlink there. Fixes <ulink url="&lfs-ticket-root;3617">#3617</ulink>.</para> </listitem> + <listitem> + <para>[Chris] - Removed DESTDIR and MANDIR from IPRoute2 + page - they are no longer needed.</para> + </listitem> </itemizedlist> </listitem> diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml index 04b828b5b..8940165b4 100644 --- a/chapter06/iproute2.xml +++ b/chapter06/iproute2.xml @@ -60,21 +60,7 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen> <para>Compile the package:</para> -<screen><userinput remap="make">make DESTDIR=</userinput></screen> - - <variablelist> - <title>The meaning of the make option:</title> - - <varlistentry> - <term><parameter>DESTDIR=</parameter></term> - <listitem> - <para>This ensures that the IPRoute2 binaries will install into - the correct directory. By default, <parameter>DESTDIR</parameter> is - set to <filename class="directory">/usr</filename>.</para> - </listitem> - </varlistentry> - - </variablelist> +<screen><userinput remap="make">make</userinput></screen> <para>This package comes with a test suite, but due to assumptions it makes, it is not possible to reliably run these tests from within the chroot @@ -87,9 +73,7 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen> <para>Install the package:</para> -<screen><userinput remap="install">make DESTDIR= \ - MANDIR=/usr/share/man \ - DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen> +<screen><userinput remap="install">make DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen> </sect2> |