From 314116e712933ab35b436673f98320e78170170f Mon Sep 17 00:00:00 2001 From: John Voltz Date: Thu, 6 Mar 2008 18:25:02 +0000 Subject: fixes for sqlite makefile --- package/sqlite/sqlite.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'package') diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index b4d573b00..dd36ecfff 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -34,12 +34,12 @@ $(SQLITE_DIR)/.configured: $(SQLITE_DIR)/.unpacked --exec-prefix=/usr \ --bindir=/usr/bin \ --sbindir=/usr/sbin \ - --libdir=/lib \ + --libdir=/usr/lib \ --libexecdir=/usr/lib \ --sysconfdir=/etc \ --datadir=/usr/share \ --localstatedir=/var \ - --includedir=/include \ + --includedir=/usr/include \ --mandir=/usr/man \ --infodir=/usr/info \ --enable-shared \ @@ -56,11 +56,12 @@ $(SQLITE_DIR)/sqlite3: $(SQLITE_DIR)/.configured $(STAGING_DIR)/usr/bin/sqlite3: $(SQLITE_DIR)/sqlite3 $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SQLITE_DIR) install + $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libsqlite3.la $(TARGET_DIR)/usr/bin/sqlite3: $(STAGING_DIR)/usr/bin/sqlite3 cp -a $(STAGING_DIR)/usr/bin/sqlite3 $(TARGET_DIR)/usr/bin - cp -a $(STAGING_DIR)/lib/libsqlite3*.so* $(TARGET_DIR)/lib/ - $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libsqlite3.so* + cp -a $(STAGING_DIR)/usr/lib/libsqlite3*.so* $(TARGET_DIR)/usr/lib/ + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libsqlite3.so* sqlite: uclibc readline-target ncurses $(TARGET_DIR)/usr/bin/sqlite3 -- cgit v1.2.3