Fix for ticket #138: Makefile doesn't use exec_prefix, has some install problems...

FossilOrigin-Name: 97fc4a71a12b52cda67b5192c3bd7bd10ac0c7a6

diff --git a/Makefile.in b/Makefile.in
index 42c510db0532677ab36500f224b9d88e14e977eb..5be0f6664322408d5309e8d5b469cdbe21109456 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,6 +31,7 @@ TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src
 # Some standard variables and programs
 #
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
 LIBTOOL = ./libtool
 
@@ -121,15 +122,15 @@ last_change:      $(SRC)
           | awk '{print $$5,$$6}' >last_change
 
 libsqlite.la:  $(LIBOBJ)
-       $(LIBTOOL) $(TCC) -o libsqlite.la $(LIBOBJ) -rpath $(prefix)/lib
+       $(LIBTOOL) $(TCC) -o libsqlite.la $(LIBOBJ) -rpath $(exec_prefix)/lib
 
 libtclsqlite.la:       tclsqlite.lo libsqlite.la
        $(LIBTOOL) $(TCC) -o libtclsqlite.la tclsqlite.lo \
-               libsqlite.la $(LIBTCL) -rpath $(prefix)/lib
+               libsqlite.la $(LIBTCL) -rpath $(exec_prefix)/lib
 
 sqlite:        $(TOP)/src/shell.c libsqlite.la sqlite.h
        $(LIBTOOL) $(TCC) $(READLINE_FLAGS) -o sqlite $(TOP)/src/shell.c \
-               libsqlite.la $(LIBREADLINE)
+               libsqlite.la $(LIBREADLINE) -rpath $(exec_prefix)/lib
 
 # Rules to build the LEMON compiler generator
 #
@@ -309,8 +310,11 @@ doc:       $(DOC)
        mv $(DOC) doc
 
 install:       sqlite libsqlite.la sqlite.h
-       $(LIBTOOL) $(INSTALL) libsqlite.la $(prefix)/lib
-       $(LIBTOOL) $(INSTALL) sqlite $(prefix)/bin
+       $(INSTALL) -d $(exec_prefix)/lib
+       $(LIBTOOL) $(INSTALL) libsqlite.la $(exec_prefix)/lib
+       $(INSTALL) -d $(exec_prefix)/bin
+       $(LIBTOOL) $(INSTALL) sqlite $(exec_prefix)/bin
+       $(INSTALL) -d $(prefix)/include
        $(INSTALL) -m 0644 sqlite.h $(prefix)/include
 
 clean: 

diff --git a/manifest b/manifest
index 8f78f37e5b3d0e01d367bb73d1cf75f71aa38d73..9335b3b278984591b34d47ca2a88ec037578954d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C Fix\sfor\sticket\s#137:\sUse\sgetpwuid()\sinstead\sof\sgetpwent().\s(CVS\s723)
-D 2002-08-21T11:26:41
-F Makefile.in 6291a33b87d2a395aafd7646ee1ed562c6f2c28c
+C Fix\sfor\sticket\s#138:\sMakefile\sdoesn't\suse\sexec_prefix,\shas\ssome\sinstall\sproblems\s(CVS\s724)
+D 2002-08-22T18:18:36
+F Makefile.in bcb81f40d9a17bd94f59e67157b1e1c54c046c2b
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
 F VERSION a8c86d12b1459b66b47ef640f3f0c87822c25901
@@ -147,7 +147,7 @@ F www/speed.tcl 7fc83f1b018e1ecc451838449542c3079ed12425
 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 39bd52d33029233d4b22df08975e9ef3c74c260f
-R 6a1abb62e413c693a06001ba7911a178
-U drh
-Z 8c1950b7c3aa43ff65e154fca595ce49
+P ea011990c552a7a6019b63f9b4341ad6c8663479
+R 01c77a2fbc8007617e801a4f6c0c3a87
+U jadams
+Z d542663e519b76f9974c46422a65caa8

diff --git a/manifest.uuid b/manifest.uuid
index 21e792b58bd3bb4d6cf84308cc1b3fcfc08e99fc..40511d325fc94b71068c222cbb6df824a94663df 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ea011990c552a7a6019b63f9b4341ad6c8663479
\ No newline at end of file
+97fc4a71a12b52cda67b5192c3bd7bd10ac0c7a6
\ No newline at end of file