fix from Gentoo for allowing TCLLIBDIR to be overridden in env (CVS 3911)

FossilOrigin-Name: e54a49e264ecd54083587f8d3b17cce4c811fddc

diff --git a/manifest b/manifest
index ff539b71f8077cd6236925fe371930202b99917a..0676bc5d6705c88bd1d171fcb8d8bbb9982ab47b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Test\ssome\smore\sincremental\sIO\serror\scases.\s(CVS\s3910)
-D 2007-05-03T18:14:10
+C fix\sfrom\sGentoo\sfor\sallowing\sTCLLIBDIR\sto\sbe\soverridden\sin\senv\s(CVS\s3911)
+D 2007-05-03T20:06:11
 F Makefile.in 8cab54f7c9f5af8f22fd97ddf1ecfd1e1860de62
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -135,7 +135,7 @@ F src/vdbefifo.c 3ca8049c561d5d67cbcb94dc909ae9bb68c0bf8f
 F src/vdbemem.c ba98f8572ec4609846b368fa7580db178022f1bb
 F src/vtab.c 89a0d5f39c1beba65a77fdb4d507b831fc5e6baf
 F src/where.c 0f17b7bed2ce50ba450e8f436d5ec8b420c4ab3f
-F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
+F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/all.test a8dca528354b70a52f130e1bb33dedc6848862a1
 F test/alter.test 6a956625399c83392671da690f44257a4ccf058b
@@ -473,7 +473,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 8a43e1676fdd29903e0b3f9d3b05d217d42962b8
-R f2daf03cbf23d5e395cd82f06da9d675
-U danielk1977
-Z 8d660e54025b30b52414bf1578df31ed
+P 64705410bdf43b6283f7a7e59ce8c20d09cd46e4
+R b876dc164a523921b9a9aaaae2c8ff74
+U vapier
+Z 4615c64c7ad9754928d4d7f62fcb1f5a

diff --git a/manifest.uuid b/manifest.uuid
index 090107392a711ea79f9a9961b62f886a2a5de33e..e6ef3b9b4efe88b28c36469931a8bcc9cb44e3a9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-64705410bdf43b6283f7a7e59ce8c20d09cd46e4
\ No newline at end of file
+e54a49e264ecd54083587f8d3b17cce4c811fddc
\ No newline at end of file

diff --git a/tclinstaller.tcl b/tclinstaller.tcl
index 88b7df1c0ffc7a7791a1560522ef245b6ea207a8..29d343e678ffa718413e0602cb6be7201ff4c6a7 100644 (file)
--- a/tclinstaller.tcl
+++ b/tclinstaller.tcl
@@ -7,14 +7,17 @@
 set VERSION [lindex $argv 0]
 set LIBFILE .libs/libtclsqlite3[info sharedlibextension]
 if { ![info exists env(DESTDIR)] } { set env(DESTDIR) "" }
-set LIBDIR $env(DESTDIR)[lindex $auto_path 0]
+if { ![info exists env(TCLLIBDIR)] } { set env(TCLLIBDIR) [lindex $auto_path 0] }
+set LIBDIR $env(DESTDIR)$env(TCLLIBDIR)
+set LIBDIR_INSTALL $env(TCLLIBDIR)
 set LIBNAME [file tail $LIBFILE]
 set LIB $LIBDIR/sqlite3/$LIBNAME
+set LIB_INSTALL $LIBDIR_INSTALL/sqlite3/$LIBNAME
 
 file delete -force $LIBDIR/sqlite3
 file mkdir $LIBDIR/sqlite3
 set fd [open $LIBDIR/sqlite3/pkgIndex.tcl w]
-puts $fd "package ifneeded sqlite3 $VERSION \[list load $LIB sqlite3\]"
+puts $fd "package ifneeded sqlite3 $VERSION \[list load $LIB_INSTALL sqlite3\]"
 close $fd
 
 # We cannot use [file copy] because that will just make a copy of