aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter06/glibc.xml16
-rw-r--r--general.ent4
3 files changed, 13 insertions, 17 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b956245c2..e3343ee98 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>January 26, 2006</para>
+ <itemizedlist>
+ <listitem>
+ <para>[jhuntwork] - Modify chapter 6 Glibc's make install command to
+ allow test-installation.pl to run.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>January 25, 2006</para>
<itemizedlist>
<listitem>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index be1ccec1d..de0d272e5 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -149,21 +149,7 @@ Prevent this warning with:</para>
<para>Install the package:</para>
-<screen><userinput>make install_root=/ install</userinput></screen>
-
-<para>The meaning of the make option:</para>
-
-<variablelist>
-<varlistentry>
-<term><parameter>install_root=/</parameter></term>
-<listitem><para>This causes the Glibc Makefile not to run the
-<filename>scripts/test-installation.pl</filename> script at the end
-of Glibc installation. Since the toolchain has not been adjusted yet for
-the new Glibc, this script would test Glibc installed in
-<filename class="directory">/tools</filename> and fail because the
-libidn add-on has not been installed there.</para></listitem>
-</varlistentry>
-</variablelist>
+<screen><userinput>make install</userinput></screen>
<para>The locales that can make the system respond in a different
language were not installed by the above command. None of the
diff --git a/general.ent b/general.ent
index 4c42a0687..419131d6c 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20060125">
-<!ENTITY releasedate "January 25, 2006">
+<!ENTITY version "SVN-20060126">
+<!ENTITY releasedate "January 26, 2006">
<!ENTITY milestone "6.2">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->