aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2012-07-23 15:15:49 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2012-07-23 15:15:49 +0000
commit421011f840a36f4e710feb5fa9c168f55d953e58 (patch)
tree33d350e73ded19c69decfd30f314996702023183 /chapter06
parent6c8d947ce03e48ca0a5585a30ac94d828fbd7e3f (diff)
Moved a few things around for ordering/convenience.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9918 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/chapter06.xml2
-rw-r--r--chapter06/e2fsprogs.xml8
2 files changed, 4 insertions, 6 deletions
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 3d15ebf75..b99e74ab6 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -30,6 +30,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
@@ -46,7 +47,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdbm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automake.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 22b6ba24f..1ebbe6a55 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -52,9 +52,7 @@ cd build</userinput></screen>
<para>Prepare E2fsprogs for compilation:</para>
-<screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true \
-LDFLAGS="-lblkid -luuid" \
-../configure --prefix=/usr \
+<screen><userinput remap="configure">../configure --prefix=/usr \
--with-root-prefix="" \
--enable-elf-shlibs \
--disable-libblkid \
@@ -64,7 +62,7 @@ LDFLAGS="-lblkid -luuid" \
<variablelist>
<title>The meaning of the configure options:</title>
-
+<!--
<varlistentry>
<term><parameter>PKG_CONFIG...</parameter></term>
<listitem>
@@ -72,7 +70,7 @@ LDFLAGS="-lblkid -luuid" \
to be built and installed first.</para>
</listitem>
</varlistentry>
-
+-->
<varlistentry>
<term><parameter>--with-root-prefix=""</parameter></term>
<listitem>