Changeset 1bc724c

Timestamp:

Feb 21, 2006, 1:41:22 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Children:

ad1481e

Parents:

da46a40

Message:

r884@server (orig r882): ken | 2005-12-11 06:21:27 -0800
Fix tcl configure with new bash

Files:

• introduction/common/changelog.xml (modified) (1 diff)
• temp-tools/64/tcl.xml (modified) (1 diff)
• temp-tools/common/tcl.xml (modified) (1 diff)
• temp-tools/multilib/tcl-64bit.xml (modified) (1 diff)

introduction/common/changelog.xml

@@ -38 +38 @@
 
     <listitem>
+      <para>December 11, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Fix Tcl configure, thanks to Greg Schafer.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 9, 2005</para>
       <itemizedlist>

temp-tools/64/tcl.xml

@@ -28 +28 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='c1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='c2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="c"><userinput>cd unix
-CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
+<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

temp-tools/common/tcl.xml

@@ -42 +42 @@
     suites in <xref linkend="chapter-building-system"/>.</para>
 
+    <para os="c1">First, fix a syntax error in the configure script.</para>
+
+<screen os="c2"><userinput>cd unix
+sed -i "s/relid'/relid/" configure</userinput></screen>
+
     <para os="b">Prepare Tcl for compilation:</para>
 
-<screen os="c"><userinput>cd unix
-./configure --prefix=/tools</userinput></screen>
+<screen><userinput>./configure --prefix=/tools</userinput></screen>
 
     <para os="d">Build the package:</para>

temp-tools/multilib/tcl-64bit.xml

@@ -26 +26 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='c1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='c2'])"/>
+
     <para os="m1">We need to change the default lib path to lib64:</para>
 
-<screen os="m2"><userinput>cd unix
-sed -i 's@\$(prefix)/lib@\$(prefix)/lib64@g' Makefile.in</userinput></screen>
+<screen os="m2"><userinput>sed -i 's@\$(prefix)/lib@\$(prefix)/lib64@g' Makefile.in
+</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"