Changeset 9324b4e for general/prog/rust.xml

Timestamp:

01/25/2019 07:09:00 PM (5 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

bdubbs/svn

Children:

0a5062a

Parents:

62f58c7a

Message:

Simplify custom rustc page

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/bdubbs@21040 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• general/prog/rust.xml (modified) (5 diffs)

general/prog/rust.xml

@@ -190 +190 @@
       If you are going to install into the
       <filename class="directory">/opt</filename> directory, remove
-      conflicting entries. As the <systemitem class="username">root</systemitem> 
+      conflicting entries and recreate the required entries. 
+      As the <systemitem class="username">root</systemitem> 
       user:
     </para>
 
-<screen><userinput>rm -rf /opt/rustc /opt/rustc-&rust-version;</userinput></screen>
+<screen role="root"><userinput>rm -rf /opt/rustc /opt/rustc-&rust-version; &amp;&amp;
+mkdir /opt/rustc-&rust-version;             &amp;&amp;
+ln -sv rustc-&rust-version; /opt/rustc</userinput></screen>
+
+    <note>
+      <para>
+        If multiple versions of <application>Rust</application> are installed
+        in <filename class="directory">/opt</filename>, changing to another
+        version only requires changing the <filename> /opt/rustc</filename>
+        symbolic link.
+      </para>
+    </note>
 
     <para>
@@ -225 +237 @@
 
 [install]
-prefix = "/usr"
+# Adjust the prefix for the desired destination
+#prefix = "/usr"
+prefix = "/opt/rustc-&rust-version;"
+
 # docdir is used even if the full awesome docs are not installed
 docdir = "share/doc/rustc-&rust-version;"
@@ -312 +327 @@
 
     <para>
-      If installing in the <filename class="directory">/opt</filename> 
-      directory, adjust the locations in the DESTDIR directory:
-    </para>
-
-<screen><command>mkdir -p         install/opt/rustc-&rust-version; &amp;&amp;
-mv install/usr/* install/opt/rustc-&rust-version; &amp;&amp;
-rmdir install/usr</command></screen>
-
-    <para>
       Now, as the <systemitem class="username">root</systemitem> user
       install the files from the DESTDIR:
@@ -327 +333 @@
 <screen role="root"><userinput>chown -R root:root install &amp;&amp;
 cp -a install/* /</userinput></screen>
-
-    <para>
-      Finally, if the application is installed in the <filename
-      class="directory">/opt</filename> directory, create a symbolic link to
-      access the current version:
-    </para>
-
-<screen role="root"><userinput>ln -sfnv rustc-&rust-version; /opt/rustc</userinput></screen>
-
-    <note>
-      <para>
-        If multiple versions of <application>Rust</application> are installed
-        in <filename class="directory">/opt</filename>, changing to another
-        version only requires changing the <filename> /opt/rustc</filename>
-        symbolic link.
-      </para>
-    </note>
-
 
   </sect2>
@@ -442 +430 @@
         If you installed <application>rustc</application> in
         <filename class="directory">/opt</filename>, you need to update the
-        following configuration files so that <application>ruxtc</application> is
+        following configuration files so that <application>rustc</application> is
         correctly found by other packages and system processes.
       </para>