r6015 - in trunk/BOOK: . general/prog introduction/welcome

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sat May 6 20:58:16 PDT 2006


Author: randy
Date: 2006-05-06 21:58:14 -0600 (Sat, 06 May 2006)
New Revision: 6015

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/prog/tcl.xml
   trunk/BOOK/general/prog/tk.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Modified the Tcl and Tk instructions to install the library interface headers using the maintainer's recommended method and removed all the hacks from previous installation methods

Modified: trunk/BOOK/general/prog/tcl.xml
===================================================================
--- trunk/BOOK/general/prog/tcl.xml	2006-05-07 02:07:15 UTC (rev 6014)
+++ trunk/BOOK/general/prog/tcl.xml	2006-05-07 03:58:14 UTC (rev 6015)
@@ -79,26 +79,33 @@
     <para>Install <application>Tcl</application> by running the following
     commands:</para>
 
-<screen><userinput>cd unix &&
-./configure --prefix=/usr --enable-threads &&
-make &&
+<!-- This is removed per discussion and fairly vigorous testing
 sed -i -e "s:${PWD}:/usr/lib:" \
        -e "s:$(dirname ${PWD}):/usr/include/tcl&tcl-ver;:" \
        -e "/TCL_LIB_FILE/ s:':\":g" \
-    tclConfig.sh</userinput></screen>
+    tclConfig.sh
+-->
 
+<screen><userinput>cd unix &&
+./configure --prefix=/usr --enable-threads &&
+make</userinput></screen>
+
     <para>To test the results, issue: <command>make test</command>.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &&
+make install-private-headers &&
+ln -v -sf tclsh&tcl-ver; /usr/bin/tclsh</userinput></screen>
+
+<!-- This is removed per discussion and fairly vigorous testing
 install -v -d /usr/include/tcl&tcl-ver;/{unix,generic} &&
 install -v -m644 *.h /usr/include/tcl&tcl-ver;/unix/ &&
 install -v -m644 ../generic/*.h /usr/include/tcl&tcl-ver;/generic/ &&
 rm -v -f /usr/include/tcl&tcl-ver;/generic/tcl{,{,Plat}Decls}.h &&
 ln -v -nsf ../../include/tcl&tcl-ver; /usr/lib/tcl&tcl-ver;/include &&
 ln -v -sf libtcl&tcl-ver;.so /usr/lib/libtcl.so &&
-ln -v -sf tclsh&tcl-ver; /usr/bin/tclsh</userinput></screen>
+-->
 
   </sect2>
 
@@ -108,6 +115,17 @@
     <para><parameter>--enable-threads</parameter>: This switch forces the package
     to build with thread support.</para>
 
+    <para><command>make install-private-headers</command>: This command is
+    used to install the <application>Tcl</application> library interface
+    headers used by other packages if they link to the
+    <application>Tcl</application> library.</para>
+
+    <para><command>ln -v -sf tclsh&tcl-ver; /usr/bin/tclsh</command>: This
+    command is used to create a compatibility symbolic link to the
+    <command>tclsh&tcl-ver;</command> file as many packages expect a file
+    named <command>tclsh</command>.</para>
+
+    <!-- This is removed per discussion and fairly vigorous testing
     <para><command>sed -i -e ... tclConfig.sh</command>: The
     <application>Tcl</application> package expects that its source tree is
     preserved so that packages depending on it for their compilation
@@ -119,6 +137,7 @@
 
     <para><command>ln -v -sf ...</command>: These commands create compatibility
     symbolic links.</para>
+    -->
 
   </sect2>
 

Modified: trunk/BOOK/general/prog/tk.xml
===================================================================
--- trunk/BOOK/general/prog/tk.xml	2006-05-07 02:07:15 UTC (rev 6014)
+++ trunk/BOOK/general/prog/tk.xml	2006-05-07 03:58:14 UTC (rev 6015)
@@ -79,13 +79,16 @@
 <para>Install <application>Tk</application> by running the following
 commands:</para>
 
-<screen><userinput>cd unix &&
-./configure --prefix=/usr --enable-threads &&
-make &&
+<!-- This is removed per discussion and fairly vigorous testing
 sed -i -e "s:${PWD}:/usr/lib:" \
        -e "s:$(dirname ${PWD}):/usr/include/tk&tk-ver;:" \
     tkConfig.sh</userinput></screen>
+-->
 
+<screen><userinput>cd unix &&
+./configure --prefix=/usr --enable-threads &&
+make</userinput></screen>
+
     <para>Running the tests is not recommended. Some tests may crash your X
     Server. To test the results anyway, issue: <command>make test</command>.
     Ensure you run it from an X Window display device with the GLX extensions
@@ -94,6 +97,10 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &&
+make install-private-headers &&
+ln -v -sf wish&tk-ver; /usr/bin/wish</userinput></screen>
+
+<!-- This is removed per discussion and fairly vigorous testing
 install -v -m755 -d /usr/include/tk&tk-ver;/{unix,generic} &&
 install -v -m644 *.h /usr/include/tk&tk-ver;/unix/ &&
 install -v -m644 ../generic/*.h /usr/include/tk&tk-ver;/generic/ &&
@@ -101,6 +108,7 @@
 ln -v -nsf ../../include/tk&tk-ver; /usr/lib/tk&tk-ver;/include &&
 ln -v -sf libtk&tk-ver;.so /usr/lib/libtk.so &&
 ln -v -sf wish&tk-ver; /usr/bin/wish</userinput></screen>
+-->
 
   </sect2>
 
@@ -110,6 +118,17 @@
     <para><parameter>--enable-threads</parameter>: This switch forces the
     package to build with thread support.</para>
 
+    <para><command>make install-private-headers</command>: This command is
+    used to install the <application>Tk</application> library interface
+    headers used by other packages if they link to the
+    <application>Tk</application> library.</para>
+
+    <para><command>ln -v -sf wish&tk-ver; /usr/bin/wish</command>: This
+    command is used to create a compatibility symbolic link to the
+    <command>wish&tk-ver;</command> file as many packages expect a file
+    named <command>wish</command>.</para>
+
+    <!-- This is removed per discussion and fairly vigorous testing
     <para><command>sed -i -e ... tkConfig.sh</command>: The
     <application>Tk</application> package expects that its source tree is
     preserved so that packages depending on it for their compilation
@@ -121,6 +140,7 @@
 
     <para><command>ln -v -sf ...</command>: These commands create compatibility
     symbolic links.</para>
+    -->
 
   </sect2>
 

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-05-07 02:07:15 UTC (rev 6014)
+++ trunk/BOOK/general.ent	2006-05-07 03:58:14 UTC (rev 6015)
@@ -1,4 +1,4 @@
-<!ENTITY day          "06">                   <!-- Always 2 digits -->
+<!ENTITY day          "07">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2006-05-07 02:07:15 UTC (rev 6014)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2006-05-07 03:58:14 UTC (rev 6015)
@@ -42,6 +42,18 @@
 -->
 
     <listitem>
+      <para>May 7th, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Modified the Tcl and Tk instructions to install
+          the library interface headers using the maintainer's recommended
+          method and removed all the hacks from previous installation
+          methods.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 6th, 2006</para>
       <itemizedlist>
         <listitem>




More information about the blfs-book mailing list