Author: randy
Date: 2005-12-24 13:09:19 -0700 (Sat, 24 Dec 2005)
New Revision: 5462
Modified:
trunk/BOOK/general/prog/tcl.xml
trunk/BOOK/general/prog/tk.xml
trunk/BOOK/introduction/welcome/changelog.xml
Log:
Fixed a syntax error in the configure scripts and simplified the existing sed
commands in the Tcl and Tk instructions
Modified: trunk/BOOK/general/prog/tcl.xml
===================================================================
--- trunk/BOOK/general/prog/tcl.xml 2005-12-24 19:16:33 UTC (rev 5461)
+++ trunk/BOOK/general/prog/tcl.xml 2005-12-24 20:09:19 UTC (rev 5462)
@@ -80,12 +80,13 @@
export V=`echo $VERSION | cut -d "." -f 1,2` &&
export DIR=$PWD &&
cd unix &&
+sed -i "s/relid'/relid/" configure &&
./configure --prefix=/usr --enable-threads &&
make &&
-sed -i "s:${DIR}/unix:/usr/lib:" tclConfig.sh &&
-sed -i "s:${DIR}:/usr/include/tcl${V}:" tclConfig.sh &&
-sed -i "s,^TCL_LIB_FILE='libtcl${V}..TCL_DBGX..so',\
-TCL_LIB_FILE=\"libtcl${V}\$\{TCL_DBGX\}.so\","
tclConfig.sh</userinput></screen>
+sed -i -e "s:${DIR}/unix:/usr/lib:" \
+ -e "s:${DIR}:/usr/include/tcl${V}:" \
+ -e "s:^TCL_LIB_FILE='libtcl${V}..TCL_DBGX..so':\
+TCL_LIB_FILE=\"libtcl${V}\$\{TCL_DBGX\}.so\":"
tclConfig.sh</userinput></screen>
<para>To test the results, issue: <command>make test</command>.</para>
@@ -123,11 +124,14 @@
<para><parameter>--enable-threads</parameter>: This switch forces the
package
to build with thread support.</para>
- <para><command>sed -i ...</command>: The <application>Tcl</application>
- package assumes that the source used to build
+ <para><command>sed -i "s/relid'/relid/" configure</command>: This command
+ fixes a syntax error in the <command>configure</command> script.</para>
+
+ <para><command>sed -i -e ... tclConfig.sh</command>: The
+ <application>Tcl</application> package assumes that the source used to
build
<application>Tcl</application> is always kept around for compiling packages
- that depend on <application>Tcl</application>. These
<command>sed</command>s
- remove the reference to the build directory and replace them by saner
+ that depend on <application>Tcl</application>. This <command>sed</command>
+ removes the references to the build directory and replaces them by saner
system-wide locations.</para>
<para><command>install ...</command>: These commands install the internal
Modified: trunk/BOOK/general/prog/tk.xml
===================================================================
--- trunk/BOOK/general/prog/tk.xml 2005-12-24 19:16:33 UTC (rev 5461)
+++ trunk/BOOK/general/prog/tk.xml 2005-12-24 20:09:19 UTC (rev 5462)
@@ -77,10 +77,11 @@
export V=`echo $VERSION | cut -d "." -f 1,2` &&
export DIR=$PWD &&
cd unix &&
+sed -i "s/relid'/relid/" configure &&
./configure --prefix=/usr --enable-threads &&
make &&
-sed -i "s:${DIR}/unix:/usr/lib:" tkConfig.sh &&
-sed -i "s:${DIR}:/usr/include/tk${V}:" tkConfig.sh</userinput></screen>
+sed -i -e "s:${DIR}/unix:/usr/lib:" \
+ -e "s:${DIR}:/usr/include/tk${V}:" tkConfig.sh</userinput></screen>
<para>The test is not recommended. Some tests may crash your X Server. To
test the results, issue: <command>make test</command>. Ensure you run it
@@ -121,13 +122,16 @@
<para><parameter>--enable-threads</parameter>: This switch forces the
package
to build with thread support.</para>
- <para><command>sed -i ...</command>: The <application>Tk</application>
package
- assumes that the source used to build <application>Tk</application> is
- always kept around for compiling packages that depend on
- <application>Tk</application>. These <command>sed</command>s remove the
- reference to the build directory and replace them by saner system-wide
- locations.</para>
+ <para><command>sed -i "s/relid'/relid/" configure</command>: This command
+ fixes a syntax error in the <command>configure</command> script.</para>
+ <para><command>sed -i -e ... tkConfig.sh</command>: The
+ <application>Tk</application> package assumes that the source used to build
+ <application>Tk</application> is always kept around for compiling packages
+ that depend on <application>Tk</application>. This <command>sed</command>
+ removes the references to the build directory and replaces them by 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 2005-12-24 19:16:33 UTC
(rev 5461)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2005-12-24 20:09:19 UTC
(rev 5462)
@@ -45,6 +45,11 @@
<para>December 24th, 2005</para>
<itemizedlist>
<listitem>
+ <para>[randy] - Fixed a syntax error in the configure scripts and
+ simplified the existing sed commands in the Tcl and Tk
+ instructions.</para>
+ </listitem>
+ <listitem>
<para>[randy] - Added pkg-config and ALSA Library as required
dependencies of the ALSA Plugins package, thanks to Joe Ciccone for
pointing out the omission.</para>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page