diff --git a/general.ent b/general.ent index bca0438d71..45bbb867d4 100644 --- a/general.ent +++ b/general.ent @@ -183,8 +183,8 @@ - - + + diff --git a/general/prog/tcl.xml b/general/prog/tcl.xml index b791da6c99..df04757691 100644 --- a/general/prog/tcl.xml +++ b/general/prog/tcl.xml @@ -6,11 +6,14 @@ - - + + - - + + + + + ]> @@ -76,45 +79,26 @@ Install Tcl by running the following commands: -export VERSION=&tcl-version; && -export V=`echo $VERSION | cut -d "." -f 1,2` && -export DIR=$PWD && -cd unix && -sed -i "s/relid'/relid/" configure && +cd unix && ./configure --prefix=/usr --enable-threads && make && -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 +sed -i -e "s:${PWD}:/usr/lib:" \ + -e "s:$(dirname ${PWD}):/usr/include/tcl&tcl-ver;:" \ + -e "/TCL_LIB_FILE/ s:':\":g" \ + tclConfig.sh To test the results, issue: make test. Now, as the root user: - - If you become the root - user in a manner that doesn't preserve the unprivileged user's - environment, ensure you correctly set the environment variable - V again before running the installation commands. - - make install && -install -v -d /usr/include/tcl${V}/unix && -install -v -m644 *.h /usr/include/tcl${V}/unix/ && -install -v -d /usr/include/tcl${V}/generic && -install -v -c -m644 ../generic/*.h /usr/include/tcl${V}/generic/ && -rm -v -f /usr/include/tcl${V}/generic/{tcl,tclDecls,tclPlatDecls}.h && -ln -v -nsf ../../include/tcl${V} /usr/lib/tcl${V}/include && -ln -v -sf libtcl${V}.so /usr/lib/libtcl.so && -ln -v -sf tclsh${V} /usr/bin/tclsh - - Clean up the unprivileged user's environment using the following - commands: - -unset VERSION && -unset V && -unset DIR +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 @@ -124,15 +108,11 @@ unset DIR --enable-threads: This switch forces the package to build with thread support. - sed -i "s/relid'/relid/" configure: This command - fixes a syntax error in the configure script. - sed -i -e ... tclConfig.sh: The - Tcl package assumes that the source used to build - Tcl is always kept around for compiling packages - that depend on Tcl. This sed - removes the references to the build directory and replaces them with saner - system-wide locations. + Tcl package expects that its source tree is + preserved so that packages depending on it for their compilation + can utilize it. This sed removes the references to the + build directory and replaces them with saner system-wide locations. install ...: These commands install the internal headers into a system-wide location. @@ -151,9 +131,9 @@ unset DIR Installed Directories - tclsh and tclsh8.4 - libtcl.so and libtclstub8.4.a - /usr/include/tcl8.4 and /usr/lib/tcl8.4 + tclsh and tclsh&tcl-ver; + libtcl.so and libtclstub&tcl-ver;.a + /usr/include/tcl&tcl-ver; and /usr/lib/tcl&tcl-ver; @@ -165,7 +145,7 @@ unset DIR tclsh - is a symlink to the tclsh8.4 + is a symlink to the tclsh&tcl-ver; program. tclsh @@ -173,13 +153,13 @@ unset DIR - - tclsh8.4 + + tclsh&tcl-ver; is a simple shell containing the Tcl interpreter. - - tclsh8.4 + + tclsh&tcl-ver; diff --git a/general/prog/tk.xml b/general/prog/tk.xml index b6fdc8abe3..dc7f8aa96d 100644 --- a/general/prog/tk.xml +++ b/general/prog/tk.xml @@ -4,25 +4,16 @@ %general-entities; - - - - - - - - + - + + + + ]> @@ -88,64 +79,42 @@ Install Tk by running the following commands: -export VERSION=&tk-version; && -export V=`echo $VERSION | cut -d "." -f 1,2` && -export DIR=$PWD && -cd unix && -sed -i "s/relid'/relid/" configure && +cd unix && ./configure --prefix=/usr --enable-threads && make && -sed -i -e "s:${DIR}/unix:/usr/lib:" \ - -e "s:${DIR}:/usr/include/tk${V}:" tkConfig.sh +sed -i -e "s:${PWD}:/usr/lib:" \ + -e "s:$(dirname ${PWD}):/usr/include/tk&tk-ver;:" \ + tkConfig.sh - The test is not recommended. Some tests may crash your X Server. To - test the results, issue: make test. Ensure you run it - from an X Window display device with the GLX extensions loaded, else the - tests will hang. + Running the tests is not recommended. Some tests may crash your X + Server. To test the results anyway, issue: make test. + Ensure you run it from an X Window display device with the GLX extensions + loaded, else the tests will hang. Now, as the root user: - - If you become the root - user in a manner that doesn't preserve the unprivileged user's - environment, ensure you correctly set the environment variable - V again before running the installation commands. - - make install && -install -v -d /usr/include/tk${V}/unix && -install -v -m644 *.h /usr/include/tk${V}/unix/ && -install -v -d /usr/include/tk${V}/generic && -install -v -m644 ../generic/*.h /usr/include/tk${V}/generic/ && -rm -v -f /usr/include/tk${V}/generic/{tk,tkDecls,tkPlatDecls}.h && -ln -v -nsf ../../include/tk${V} /usr/lib/tk${V}/include && -ln -v -sf libtk${V}.so /usr/lib/libtk.so && -ln -v -sf wish${V} /usr/bin/wish - - Clean up the unprivileged user's environment using the following - commands: - -unset VERSION && -unset V && -unset DIR +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/ && +rm -v -f /usr/include/tk&tk-ver;/generic/tk{,{,Plat}Decls}.h && +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 Command Explanations - --enable-threads: This switch forces the package - to build with thread support. - - sed -i "s/relid'/relid/" configure: This command - fixes a syntax error in the configure script. + --enable-threads: This switch forces the + package to build with thread support. sed -i -e ... tkConfig.sh: The - Tk package assumes that the source used to build - Tk is always kept around for compiling packages - that depend on Tk. This sed - removes the references to the build directory and replaces them with saner - system-wide locations. + Tk package expects that its source tree is + preserved so that packages depending on it for their compilation + can utilize it. This sed removes the references to the + build directory and replaces them with saner system-wide locations. install ...: These commands install the internal headers into a system-wide location. @@ -164,9 +133,9 @@ unset DIR Installed Directories - wish and wish8.4 - libtk.so and libtkstub8.4.a - /usr/include/tk8.4 and /usr/lib/tk8.4 + wish and wish&tk-ver; + libtk.so and libtkstub&tk-ver;.a + /usr/include/tk&tk-ver; and /usr/lib/tk&tk-ver; @@ -178,21 +147,22 @@ unset DIR wish - is a symlink to the wish8.4 program. + is a symlink to the wish&tk-ver; + program. wish - - wish8.4 + + wish&tk-ver; is a simple shell containing the Tk toolkit that creates a main window and then processes Tcl commands. - - wish8.4 + + wish&tk-ver; diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 353ad96ca5..78a6e4511f 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -44,6 +44,10 @@ April 29th, 2006 + + [randy] - Updated Tcl and Tk to 8.4.13. Also modified the build + commands to not use any user-created environment variables. + [bdubbs] - Changed openssh libexecdir to /usr/lib/openssh.