Author: ag
Date: 2008-03-26 13:44:59 -0600 (Wed, 26 Mar 2008)
New Revision: 7318
Modified:
trunk/BOOK/general/prog/tcl.xml
trunk/BOOK/general/prog/tk.xml
trunk/BOOK/introduction/welcome/changelog.xml
Log:
Added a sed to Tcl/Tk instructions to fix #2487
Modified: trunk/BOOK/general/prog/tcl.xml
===================================================================
--- trunk/BOOK/general/prog/tcl.xml 2008-03-26 17:18:33 UTC (rev 7317)
+++ trunk/BOOK/general/prog/tcl.xml 2008-03-26 19:44:59 UTC (rev 7318)
@@ -75,16 +75,15 @@
<para>Install <application>Tcl</application> by running the following
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 &&
./configure --prefix=/usr --enable-threads &&
-make</userinput></screen>
+make &&
+sed -i \
+ -e "[EMAIL PROTECTED](TCL_SRC_DIR='\)[EMAIL PROTECTED]/usr/include'@" \
+ -e "/TC_B/[EMAIL PROTECTED]'\(-L\)[EMAIL PROTECTED]'\1/usr/lib@" \
+ -e "/SEARCH/s/=.*/=''/" \
+ tclConfig.sh
+</userinput></screen>
<para>To test the results, issue: <command>make test</command>.</para>
@@ -121,13 +120,13 @@
<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
can utilize it. This <command>sed</command> removes the references to the
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>
Modified: trunk/BOOK/general/prog/tk.xml
===================================================================
--- trunk/BOOK/general/prog/tk.xml 2008-03-26 17:18:33 UTC (rev 7317)
+++ trunk/BOOK/general/prog/tk.xml 2008-03-26 19:44:59 UTC (rev 7318)
@@ -75,15 +75,15 @@
<para>Install <application>Tk</application> by running the following
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 &&
./configure --prefix=/usr --enable-threads &&
-make</userinput></screen>
+make &&
+sed -i \
+ -e "[EMAIL PROTECTED](TK_SRC_DIR='\)[EMAIL PROTECTED]/usr/include'@" \
+ -e "/TK_B/[EMAIL PROTECTED]'\(-L\)[EMAIL PROTECTED]'\1/usr/lib@" \
+ -e "/SEARCH/s/=.*/=''/" \
+ tkConfig.sh
+</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>.
@@ -124,13 +124,13 @@
<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
can utilize it. This <command>sed</command> removes the references to the
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>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2008-03-26 17:18:33 UTC
(rev 7317)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2008-03-26 19:44:59 UTC
(rev 7318)
@@ -45,6 +45,9 @@
<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>
</listitem>
<listitem>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
