[Clfs-commits] commit: r4558 - in /branches/clfs-embedded: BOOK/final-system/common/zlib.xml BOOK/materials/common/patches.xml BOOK/patches.ent patches/zlib-1.2.3-DESTDIR-1.patch

[svn at cross-lfs.org]

Author: jim
Date: Sun Jan 25 22:12:16 2009
New Revision: 4558

Log:
Removed Zlib DESTDIR patch

Removed:
    branches/clfs-embedded/patches/zlib-1.2.3-DESTDIR-1.patch
Modified:
    branches/clfs-embedded/BOOK/final-system/common/zlib.xml
    branches/clfs-embedded/BOOK/materials/common/patches.xml
    branches/clfs-embedded/BOOK/patches.ent

Modified: branches/clfs-embedded/BOOK/final-system/common/zlib.xml
==============================================================================
--- branches/clfs-embedded/BOOK/final-system/common/zlib.xml (original)
+++ branches/clfs-embedded/BOOK/final-system/common/zlib.xml Sun Jan 25 22:12:16 2009
@@ -24,10 +24,6 @@
 
   <sect2 role="installation">
     <title>Installation of Zlib</title>
-
-    <para os="p1">This patch will add the ability to use DESTDIR:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&zlib-destdir-patch;</userinput></screen>
 
     <para os="a">Change the default optimization to Os</para>
 
@@ -56,7 +52,7 @@
 
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="f"><userinput>make prefix=${CLFS}/usr install</userinput></screen>
 
     <para os="g">The previous command installed a <filename
     class="extension">.so</filename> file in <filename

Modified: branches/clfs-embedded/BOOK/materials/common/patches.xml
==============================================================================
--- branches/clfs-embedded/BOOK/materials/common/patches.xml (original)
+++ branches/clfs-embedded/BOOK/materials/common/patches.xml Sun Jan 25 22:12:16 2009
@@ -101,14 +101,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Zlib DESTDIR Patch - <token>&zlib-destdir-patch-size;</token>:</term> <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&zlib-destdir-patch;"/></para>
-        <para>MD5 sum: <literal>&zlib-destdir-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
   </variablelist>
 
   <para os="a">Total size of these patches: about <returnvalue/></para>

Modified: branches/clfs-embedded/BOOK/patches.ent
==============================================================================
--- branches/clfs-embedded/BOOK/patches.ent (original)
+++ branches/clfs-embedded/BOOK/patches.ent Sun Jan 25 22:12:16 2009
@@ -41,10 +41,6 @@
 <!ENTITY uclibc-branch_update-patch "uClibc-&uclibc-version;-branch_update-1.patch">
 <!ENTITY uclibc-branch_update-patch-md5 "aba411c0c1b35e1802ef9cac92b62d1f">
 <!ENTITY uclibc-branch_update-patch-size "88 KB">
-
-<!ENTITY zlib-destdir-patch "zlib-&zlib-version;-DESTDIR-1.patch">
-<!ENTITY zlib-destdir-patch-md5 "d21bdd08bf444f87f275b6aef44e1a84">
-<!ENTITY zlib-destdir-patch-size "8 KB">
 
 <!-- Beyond patches -->