From: danielk1977 <danielk1977@noemail.net>
Date: Mon, 4 Aug 2008 04:28:18 +0000 (+0000)
Subject: Add the pkgconfigdir variable to Makefile.in. Ticket #3242. (CVS 5531)
X-Git-Tag: version-3.6.10~646
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94bdf89440c7fa9d0696da057283ae159b89d63d;p=thirdparty%2Fsqlite.git

Add the pkgconfigdir variable to Makefile.in. Ticket #3242. (CVS 5531)

FossilOrigin-Name: 540c9d4c0daf9ddf07c95bb3eb9f294a2dd0285d
---

diff --git a/Makefile.in b/Makefile.in
index cc08a20681..ce94298983 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -135,6 +135,7 @@ LTLINK_EXTRAS += $(GCOV_LDFLAGS$(USE_GCOV))
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 libdir = @libdir@
+pkgconfigdir = $(libdir)/pkgconfig
 bindir = @bindir@
 includedir = @includedir@
 INSTALL = @INSTALL@
@@ -724,8 +725,8 @@ install:	sqlite3$(BEXE) libsqlite3.la sqlite3.h ${HAVE_TCL:1=tcl_install}
 	$(INSTALL) -d $(DESTDIR)$(includedir)
 	$(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(includedir)
 	$(INSTALL) -m 0644 $(TOP)/src/sqlite3ext.h $(DESTDIR)$(includedir)
-	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig; 
-	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(libdir)/pkgconfig; 
+	$(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
+	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir)
 
 tcl_install:	libtclsqlite3.la
 	$(TCLSH_CMD) $(TOP)/tclinstaller.tcl $(VERSION)
diff --git a/manifest b/manifest
index 2c047939bc..5e305f70a6 100644
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Fix\s(make\stest)\swith\sSQLITE_OMIT_COMPOUND_SELECT.\sTicket\s#3235.\s(CVS\s5530)
-D 2008-08-04T03:51:24
+C Add\sthe\spkgconfigdir\svariable\sto\sMakefile.in.\sTicket\s#3242.\s(CVS\s5531)
+D 2008-08-04T04:28:19
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
-F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
+F Makefile.in 2713ea64947be3b35f35d9a3158bb8299c90b019
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
 F README b974cdc3f9f12b87e851b04e75996d720ebf81ac
 F VERSION 1d5b2c9192236ed2c6bad659a7c2d1662e39e7b9
@@ -617,7 +617,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 358bd6609ebffa293a9a98fae14924b8162332d8
-R b361eb02d661515ba15c33e4b9cfd604
+P 9ca975c8fdeaae7d5af8fe62e097d8d251362cfe
+R 5bb4b25bbf04f572bd726e4ba29e159f
 U danielk1977
-Z 2bca942a13d13c6148e0299892901ddb
+Z f2555b51388b9242a7411cde42e68351
diff --git a/manifest.uuid b/manifest.uuid
index 54ef7bb4a6..1a48858805 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9ca975c8fdeaae7d5af8fe62e097d8d251362cfe
\ No newline at end of file
+540c9d4c0daf9ddf07c95bb3eb9f294a2dd0285d
\ No newline at end of file