From: vapier Date: Wed, 18 Feb 2009 04:33:59 +0000 (+0000) Subject: break libsqlite3.la install step out so the tcl install step can depend on it as... X-Git-Tag: version-3.6.15~450 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afea9748700a7abfded340b27afb00a42bbbb252;p=thirdparty%2Fsqlite.git break libsqlite3.la install step out so the tcl install step can depend on it as well (CVS 6300) FossilOrigin-Name: 0998c55467a777783e4d451b3c82d769bef84d0b --- diff --git a/Makefile.in b/Makefile.in index 5461633eac..03f95f6e12 100644 --- a/Makefile.in +++ b/Makefile.in @@ -765,9 +765,11 @@ sqlite3_analyzer$(TEXE): $(TESTFIXTURE_SRC) $(TOP)/tool/spaceanal.tcl $(TEMP_STORE) -o $@ $(TESTFIXTURE_SRC) $(LIBTCL) -install: sqlite3$(BEXE) libsqlite3.la sqlite3.h sqlite3.pc ${HAVE_TCL:1=tcl_install} +lib_install: libsqlite3.la $(INSTALL) -d $(DESTDIR)$(libdir) $(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir) + +install: sqlite3$(BEXE) lib_install sqlite3.h sqlite3.pc ${HAVE_TCL:1=tcl_install} $(INSTALL) -d $(DESTDIR)$(bindir) $(LTINSTALL) sqlite3$(BEXE) $(DESTDIR)$(bindir) $(INSTALL) -d $(DESTDIR)$(includedir) @@ -778,7 +780,7 @@ install: sqlite3$(BEXE) libsqlite3.la sqlite3.h sqlite3.pc ${HAVE_TCL:1=tcl_inst pkgIndex.tcl: echo 'package ifneeded sqlite3 $(RELEASE) [list load $(TCLLIBDIR)/libtclsqlite3.so sqlite3]' > $@ -tcl_install: libtclsqlite3.la pkgIndex.tcl +tcl_install: lib_install libtclsqlite3.la pkgIndex.tcl $(INSTALL) -d $(DESTDIR)$(TCLLIBDIR) $(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR) rm -f $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.a diff --git a/manifest b/manifest index 4e8565193a..cb86b94b92 100644 --- a/manifest +++ b/manifest @@ -1,7 +1,7 @@ -C Version\s3.6.11\s(CVS\s6299) -D 2009-02-18T00:00:04 +C break\slibsqlite3.la\sinstall\sstep\sout\sso\sthe\stcl\sinstall\sstep\scan\sdepend\son\sit\sas\swell\s(CVS\s6300) +D 2009-02-18T04:34:00 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 -F Makefile.in c7a5a30fb6852bd7839b1024e1661da8549878ee +F Makefile.in 1d83fa2b1fd326b9e121012bd1ff9740537e12b3 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.vxwSH4 d53b4be86491060d498b22148951b6d765884cab F README b974cdc3f9f12b87e851b04e75996d720ebf81ac @@ -701,7 +701,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P f6ba7bb9152cffc9f67dfa7de12e36a3244b7e03 -R 793a2b2b9355549182d95e51bb87d221 -U drh -Z a0db0161154f15266372e6c70dcfd92d +P 6abd630c8703ed09af27776096677c2f35da6b85 +R 770219ddbeb117054e96a3477a2b509b +U vapier +Z 39748390a6ccf74ec32657857f96fd21 diff --git a/manifest.uuid b/manifest.uuid index f5baec81d9..61635e176e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6abd630c8703ed09af27776096677c2f35da6b85 \ No newline at end of file +0998c55467a777783e4d451b3c82d769bef84d0b \ No newline at end of file