[blfs-book] r10471 - in trunk/BOOK: . general/genutils general/prog

ken at linuxfromscratch.org ken at linuxfromscratch.org
Sat Jul 28 08:40:05 PDT 2012


Author: ken
Date: 2012-07-28 09:39:53 -0600 (Sat, 28 Jul 2012)
New Revision: 10471

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/genutils/imagemagick.xml
   trunk/BOOK/general/prog/subversion.xml
Log:
Change lfs-perl-version entity and correct perl directories installed by ImageMagick.

Modified: trunk/BOOK/general/genutils/imagemagick.xml
===================================================================
--- trunk/BOOK/general/genutils/imagemagick.xml	2012-07-27 23:50:10 UTC (rev 10470)
+++ trunk/BOOK/general/genutils/imagemagick.xml	2012-07-28 15:39:53 UTC (rev 10471)
@@ -274,9 +274,8 @@
         numerous plugin modules</seg>
         <seg>/usr/include/Magick++, /usr/include/magick, /usr/include/wand,
         /usr/lib/ImageMagick-&imagemagick-version;,
-        /usr/lib/perl5/site_perl/5.x.y/MYARCH-linux/auto/Image/Magick
-        (where 5.x.y is your version of <application>perl</application> and MYARCH
-        is i686 or x86_64),
+        /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/Image,
+        /usr/lib/perl5/site_perl/&lfs-perl-version;/Image/Magick,
         /usr/share/ImageMagick-&imagemagick-version; and
         /usr/share/doc/ImageMagick-&imagemagick-version;</seg>
       </seglistitem>

Modified: trunk/BOOK/general/prog/subversion.xml
===================================================================
--- trunk/BOOK/general/prog/subversion.xml	2012-07-27 23:50:10 UTC (rev 10470)
+++ trunk/BOOK/general/prog/subversion.xml	2012-07-28 15:39:53 UTC (rev 10471)
@@ -325,9 +325,9 @@
         </seg>
         <seg>
           /usr/include/subversion-1,
-          /usr/lib/perl5/site_perl/&lfs-perl-version;/i686-linux/auto/SVN (optional),
-          /usr/lib/perl5/site_perl/&lfs-perl-version;/i686-linux/SVN (optional),
-          /usr/lib/ruby/site_ruby/x.x/i686-linux/svn (optional),
+          /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/SVN (optional),
+          /usr/lib/perl5/site_perl/&lfs-perl-version;/SVN (optional),
+          /usr/lib/ruby/site_ruby/<x.y>/i686-linux/svn (al),
           /usr/lib/svn-javahl (optional),
           /usr/lib/svn-python (optional) and
           /usr/share/doc/subversion-&subversion-version;

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2012-07-27 23:50:10 UTC (rev 10470)
+++ trunk/BOOK/general.ent	2012-07-28 15:39:53 UTC (rev 10471)
@@ -56,7 +56,10 @@
 <!ENTITY lfs-gcc-version              "4.7.0">
 <!ENTITY lfs-gdbm-version             "1.8.3">
 <!ENTITY lfs-m4-version               "1.4.14">
-<!ENTITY lfs-perl-version             "5.12.1">
+<!-- this was originally the perl version used by the corresponding
+ version of lfs, in those days always for i686, but now BLFS is a rolling
+ release -->
+<!ENTITY lfs-perl-version             "<5.x.y>/<arch-linux>">
 <!ENTITY lfs-shadow-version           "4.1.5">
 <!ENTITY lfs-vim-version              "7.3">
 <!-- End LFS versions -->




More information about the blfs-book mailing list