Edit build scripts for macOS and linux

ci/linux/build_linux_tkgl.sh

@@ -13,41 +13,36 @@ rm -rf tcl9 tk9 tcl8 tk8
 mkdir tcl9 tk9 tcl8 tk8
 
 echo downloading tcl/tk source ...
+wget --no-check-certificate -O tcl8.tar.gz $TCL8_URL
+wget --no-check-certificate -O tk8.tar.gz $TK8_URL
 wget --no-check-certificate -O tcl9.tar.gz $TCL9_URL
 wget --no-check-certificate -O tk9.tar.gz $TK9_URL
+
 echo extracting source ...
+tar xf tcl8.tar.gz --directory=tcl8 --strip-components=1
+tar xf tk8.tar.gz --directory=tk8 --strip-components=1
 tar xf tcl9.tar.gz --directory=tcl9 --strip-components=1
 tar xf tk9.tar.gz --directory=tk9 --strip-components=1
-#cd tcl9/unix
-#echo building tcl9 ...
-#./configure
-#make -j4
-#cd ../../tk9/unix
-#echo building tk9 ...
-#./configure --with-tcl=../../tcl9/unix
-#make -j4
-#cd ../..
+
+echo configuring source directories
+cd tcl8/unix
+./configure
+cd ../../tk8/unix
+./configure --with-tcl=../../tcl8/unix
+cd ../..
+cd tcl9/unix
+./configure
+cd ../../tk9/unix
+./configure --with-tcl=../../tcl9/unix
+cd ../..
 cp ci/linux/linux_configure configure
-./configure --with-tcl=tcl9/unix --with-tk=tk9/unix
+echo building for tcl/tk 8
+./configure --with-tcl=tcl8/unix --with-tk=tk8/unix
 make
-mv libtcl9Tkgl1.0.so dist/Tkgl1.0
+mv libTkgl1.0.so dist/Tkgl1.0
 rm -rf build
-echo downloading tcl/tk source ...
-wget --no-check-certificate -O tcl8.tar.gz $TCL8_URL
-wget --no-check-certificate -O tk8.tar.gz $TK8_URL
-echo extracting source ...
-tar xf tcl8.tar.gz --directory=tcl8 --strip-components=1
-tar xf tk8.tar.gz --directory=tk8 --strip-components=1
-#cd tcl8/unix
-#echo building tcl8 ...
-#./configure
-#make -j4
-#cd ../../tk8/unix
-#echo building tk8 ...
-#./configure --with-tcl=../../tcl8/unix
-#make -j4
-#cd ../..
-./configure --with-tcl=tcl8/unix --with-tk=tk8/unix
+echo building for tcl/tk 9
+./configure --with-tcl=tcl9/unix --with-tk=tk9/unix
 make
-mv libTkgl1.0.so dist/Tkgl.0
+mv libtcl9Tkgl1.0.so dist/Tkgl1.0
 mv pkgIndex.tcl dist/Tkgl1.0

ci/macOS/build_mac_tkgl.sh

@@ -37,10 +37,10 @@ fi
 cd tcl8/macosx
 ./configure
 cd ../../tk8/macosx
-./configure
+./configure --with-tcl=../../tcl8
 cd ../..
 cp ci/macOS/mac_configure configure
-./configure --with-tcl=tcl8/macosx --with-tk8/macosx
+./configure --with-tcl=tcl8/macosx --with-tk=tk8/macosx
 make
 ./configure --with-tcl=tcl9/macosx --with-tk=tk9/macosx
 make