Make use of $(libdir) in the Makefile.in. Ticket #904. (CVS 1967)

FossilOrigin-Name: 10b5e5173339cc7f052aace1b4056a057afe3e66

diff --git a/Makefile.in b/Makefile.in
index db15e6c808dbc647bdd29291c657be2b9b8cf7d2..d017d642a8e18cde05367b1207dc4bacee207c5f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,6 +32,7 @@ TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src -DNDEBUG
 #
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+libdir = @libdir@
 INSTALL = @INSTALL@
 LIBTOOL = ./libtool
 RELEASE = @ALLOWRELEASE@
@@ -188,12 +189,12 @@ last_change:      $(SRC)
           | awk '{print $$5,$$6}' >last_change
 
 libsqlite3.la: $(LIBOBJ)
-       $(LTLINK) -o libsqlite3.la $(LIBOBJ) ${RELEASE} -rpath @exec_prefix@/lib \
+       $(LTLINK) -o libsqlite3.la $(LIBOBJ) ${RELEASE} -rpath $(libdir) \
                -version-info "8:6:8"
 
 libtclsqlite3.la:      tclsqlite.lo libsqlite3.la
        $(LTLINK) -o libtclsqlite3.la tclsqlite.lo \
-               libsqlite3.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite \
+               libsqlite3.la $(LIBTCL) -rpath $(libdir)/sqlite \
                -version-info "8:6:8"
 
 sqlite3@TARGET_EXEEXT@:        $(TOP)/src/shell.c libsqlite3.la sqlite3.h
@@ -543,14 +544,14 @@ doc:      common.tcl $(DOC)
        mv $(DOC) doc
 
 install:       sqlite3 libsqlite3.la sqlite3.h
-       $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib
-       $(LTINSTALL) libsqlite3.la $(DESTDIR)$(exec_prefix)/lib
+       $(INSTALL) -d $(DESTDIR)$(libdir)
+       $(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
        $(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
        $(LTINSTALL) sqlite3 $(DESTDIR)$(exec_prefix)/bin
        $(INSTALL) -d $(DESTDIR)$(prefix)/include
        $(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(prefix)/include
-       $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
-       $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
+       $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig; 
+       $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(libdir)/pkgconfig; 
 
 clean: 
        rm -f *.lo *.la *.o sqlite3@TARGET_EXEEXT@ libsqlite3.la

diff --git a/manifest b/manifest
index db7ec0d26e156407b1f0ac5571185b9637b7e98b..a9309b28512194647a43be63f03691558dc33ed1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C Create\sdirectories\susing\s"mkdir\s-p".\s\sTicket\s#903.\s(CVS\s1966)
-D 2004-09-17T20:47:17
-F Makefile.in 281e91392b9e14d3f4dd031866ac8ab7e3e1f983
+C Make\suse\sof\s$(libdir)\sin\sthe\sMakefile.in.\s\sTicket\s#904.\s(CVS\s1967)
+D 2004-09-17T21:07:35
+F Makefile.in 7caec4bd363c293f4c788702bab9e4594a6dff50
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
 F VERSION d28cfc2e7714a747851e50cc1a5ee8ab0ded7a78
@@ -247,7 +247,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 8bb0221da8ab49d766db7cd2f815ba2a305e15de
-R 664a9329db2f0606e2f5482a06f87e66
+P 02de1cf95e0cf230aeebdb0c4684e486b1424810
+R 5fd45ed04f8acd8e14a46cd20cdb76cc
 U drh
-Z 3f06463bca1e56977061c9c05bc5094e
+Z 81a3747d954a649eef9094d502c1fbe6

diff --git a/manifest.uuid b/manifest.uuid
index bdf1d941a3523e42e5e2ba40b435214abdb1d7b2..b06d66814ca97bd00862757e1cb5c5e31359c624 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-02de1cf95e0cf230aeebdb0c4684e486b1424810
\ No newline at end of file
+10b5e5173339cc7f052aace1b4056a057afe3e66
\ No newline at end of file