Specify installation lib in 'rpath' options for sqlite3 executable (CVS 4857)

FossilOrigin-Name: 5076d480337145f2e4b36798c6c13b9810f62721

diff --git a/Makefile.in b/Makefile.in
index 007572bc7f69da3240c4be3631f15aab3dbd6ba0..03d4455ccda32cf2ec33823eae454ab5cbe6935d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -374,18 +374,18 @@ last_change:      $(SRC)
 
 libsqlite3.la: $(LIBOBJ)
        $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(TLIBS) \
-               ${ALLOWRELEASE} -rpath $(libdir) -version-info "8:6:8"
+               ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8"
 
 libtclsqlite3.la:      tclsqlite.lo libsqlite3.la
        $(LTLINK) -o libtclsqlite3.la tclsqlite.lo \
                $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TLIBS) \
-                -rpath $(libdir)/sqlite \
+                -rpath "$(libdir)/sqlite" \
                -version-info "8:6:8"
 
 sqlite3$(TEXE):        $(TOP)/src/shell.c libsqlite3.la sqlite3.h
        $(LTLINK) $(READLINE_FLAGS) \
                -o $@ $(TOP)/src/shell.c libsqlite3.la \
-               $(LIBREADLINE) $(TLIBS)
+               $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
 
 # This target creates a directory named "tsrc" and fills it with
 # copies of all of the C source code and header files needed to

diff --git a/manifest b/manifest
index 215e49f193faffccac6aaf6e55b7d0864db6246e..19fce6b0a5ca332483d32e17b86a2cb694563638 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Add/move\sfiles\sin\sMakefile.in\sto\sbring\sit\smore\sin\sline\swith\smain.mk\s(CVS\s4856)
-D 2008-03-13T18:28:04
+C Specify\sinstallation\slib\sin\s'rpath'\soptions\sfor\ssqlite3\sexecutable\s(CVS\s4857)
+D 2008-03-13T19:55:20
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
-F Makefile.in 6640fb5fb5a6b85170ed01188bed30d64b22637d
+F Makefile.in 83d7b574d44848fba2eb0a5200ebdaaf88d9421e
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
 F README b974cdc3f9f12b87e851b04e75996d720ebf81ac
 F VERSION 7a41970464b74225915bcaf9d76efd01f26e08f9
@@ -623,7 +623,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 85585f11049c4c3278dc2732676b0caa44cf1e9d
-R be1eab5cdc46226b0bbd551808ef1f93
+P b57fc81c3d5f6c7091bdd37f8164887f990a5128
+R b89397cbdaa98f0be7833b910b414abd
 U mlcreech
-Z 676a611a1be445df78b935d8e115bd76
+Z 1e14a53dec4509e0beda84bfd89ccbe4

diff --git a/manifest.uuid b/manifest.uuid
index 4b466b4fbacc3267a7e9431b56fdeb5b1f49e361..5145c5bc994ad6b7a4a0782a611abec93f1e788f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b57fc81c3d5f6c7091bdd37f8164887f990a5128
\ No newline at end of file
+5076d480337145f2e4b36798c6c13b9810f62721
\ No newline at end of file