Changeset 206b7a1

Timestamp:

03/26/2008 07:44:59 PM (16 years ago)

Author:

Ag Hatzimanikas <ag@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

d6e5d4f

Parents:

1ae11c9

Message:

Added a sed to Tcl/Tk instructions to fix #2487

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@7318 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/prog/tcl.xml (modified) (3 diffs)
• general/prog/tk.xml (modified) (3 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general/prog/tcl.xml

@@ -76 +76 @@
     commands:</para>
 
-<!-- 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
--->
-
 <screen><userinput>cd unix &amp;&amp;
 ./configure --prefix=/usr --enable-threads &amp;&amp;
-make</userinput></screen>
+make &amp;&amp;
+sed -i \
+    -e "s@^\(TCL_SRC_DIR='\).*@\1/usr/include'@" \
+    -e "/TC_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \ 
+    -e "/SEARCH/s/=.*/=''/" \                    
+    tclConfig.sh
+</userinput></screen>
 
     <para>To test the results, issue: <command>make test</command>.</para>
@@ -122 +121 @@
     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
@@ -129 +127 @@
     build directory and replaces them with saner system-wide locations.</para>
 
+    <!--
     <para><command>install ...</command>: These commands install the internal
     headers into a system-wide location.</para>

general/prog/tk.xml

@@ -76 +76 @@
 commands:</para>
 
-<!-- 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 &amp;&amp;
 ./configure --prefix=/usr --enable-threads &amp;&amp;
-make</userinput></screen>
+make &amp;&amp;
+sed -i \
+    -e "s@^\(TK_SRC_DIR='\).*@\1/usr/include'@" \
+    -e "/TK_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \
+    -e "/SEARCH/s/=.*/=''/" \
+    tkConfig.sh
+</userinput></screen>
 
     <para>Running the tests is not recommended. Some tests may crash your X
@@ -125 +125 @@
     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
@@ -132 +131 @@
     build directory and replaces them with saner system-wide locations.</para>
 
+    <!-- 
     <para><command>install ...</command>: These commands install the internal
     headers into a system-wide location.</para>

introduction/welcome/changelog.xml

@@ -45 +45 @@
       <para>March 26th, 2008</para>
       <itemizedlist>
+        <listitem>
+          <para>[ag] - Added a sed to Tcl/Tk instructions. Fixes #2487.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Updated to Stunnel-4.21.</para>