[blfs-book] r11750 - trunk/BOOK/x/installing

igor at higgs.linuxfromscratch.org igor at higgs.linuxfromscratch.org
Mon Sep 2 14:11:11 PDT 2013


Author: igor
Date: Mon Sep  2 14:11:10 2013
New Revision: 11750

Log:
prevent questions to remove write protected files in xorg installation

Modified:
   trunk/BOOK/x/installing/mesalib.xml
   trunk/BOOK/x/installing/x7app.xml
   trunk/BOOK/x/installing/x7font.xml
   trunk/BOOK/x/installing/x7lib.xml
   trunk/BOOK/x/installing/x7proto.xml

Modified: trunk/BOOK/x/installing/mesalib.xml
==============================================================================
--- trunk/BOOK/x/installing/mesalib.xml	Mon Sep  2 13:26:16 2013	(r11749)
+++ trunk/BOOK/x/installing/mesalib.xml	Mon Sep  2 14:11:10 2013	(r11750)
@@ -357,9 +357,6 @@
       <application>LLVM</application>.
     </para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
     <para>
       <option>--enable-r600-llvm-compiler</option>: Use this switch to
       enable experimental R600 <application>LLVM</application> backend

Modified: trunk/BOOK/x/installing/x7app.xml
==============================================================================
--- trunk/BOOK/x/installing/x7app.xml	Mon Sep  2 13:26:16 2013	(r11749)
+++ trunk/BOOK/x/installing/x7app.xml	Mon Sep  2 14:11:10 2013	(r11750)
@@ -284,7 +284,7 @@
   make
   as_root make install
   popd
-  rm -r $packagedir
+  rm -rf $packagedir
 done</userinput></screen>
 
     <para>Finally, exit the shell that was started earlier:</para>

Modified: trunk/BOOK/x/installing/x7font.xml
==============================================================================
--- trunk/BOOK/x/installing/x7font.xml	Mon Sep  2 13:26:16 2013	(r11749)
+++ trunk/BOOK/x/installing/x7font.xml	Mon Sep  2 14:11:10 2013	(r11750)
@@ -252,7 +252,7 @@
   make
   as_root make install
   popd
-  rm -r $packagedir
+  rm -rf $packagedir
 done</userinput></screen>
 
     <para>Finally, exit the shell that was started earlier:</para>

Modified: trunk/BOOK/x/installing/x7lib.xml
==============================================================================
--- trunk/BOOK/x/installing/x7lib.xml	Mon Sep  2 13:26:16 2013	(r11749)
+++ trunk/BOOK/x/installing/x7lib.xml	Mon Sep  2 14:11:10 2013	(r11750)
@@ -249,7 +249,7 @@
   make
   as_root make install
   popd
-  rm -r $packagedir
+  rm -rf $packagedir
   as_root /sbin/ldconfig
 done</userinput></screen>
 

Modified: trunk/BOOK/x/installing/x7proto.xml
==============================================================================
--- trunk/BOOK/x/installing/x7proto.xml	Mon Sep  2 13:26:16 2013	(r11749)
+++ trunk/BOOK/x/installing/x7proto.xml	Mon Sep  2 14:11:10 2013	(r11750)
@@ -214,7 +214,7 @@
   ./configure $XORG_CONFIG
   as_root make install
   popd
-  rm -r $packagedir
+  rm -rf $packagedir
 done</userinput></screen>
 
     <para>Finally, exit the shell that was started earlier:</para>



More information about the blfs-book mailing list