summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2008-07-17 13:20:23 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2008-07-17 13:20:23 +0000
commit2fa2806210313e19ea4cdaf25d2d66f483084c19 (patch)
tree0d689c4905f533f08bac13f12d26a793dc6a6335
parentfa0bedd0f591fe9e42a9309627765929ebbd85f8 (diff)
sqlite: fix target install and clean
- install -D isn't a good idea for symlinks as it replaces them with the target files, leading to 3 copies of libsqlite. - clean was missing include and pkgconfig files
-rw-r--r--package/database/sqlite/sqlite.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/package/database/sqlite/sqlite.mk b/package/database/sqlite/sqlite.mk
index 80d9395ea..7df58574b 100644
--- a/package/database/sqlite/sqlite.mk
+++ b/package/database/sqlite/sqlite.mk
@@ -52,8 +52,8 @@ $(STAGING_DIR)/usr/bin/sqlite3: $(SQLITE_DIR)/sqlite3
$(TARGET_DIR)/usr/bin/sqlite3: $(STAGING_DIR)/usr/bin/sqlite3
$(INSTALL) -m 0755 -D $^ $@
$(STRIPCMD) $(STRIP_STRIP_ALL) $@
- $(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/libsqlite3*.so* $(TARGET_DIR)/usr/lib/
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libsqlite3.so*
+ cp -dpf $(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
@@ -63,6 +63,8 @@ sqlite-clean:
-$(MAKE) -C $(SQLITE_DIR) clean
-rm -rf $(STAGING_DIR)/usr/lib/libsqlite*
-rm -rf $(STAGING_DIR)/usr/bin/sqlite3
+ -rm -rf $(STAGING_DIR)/usr/include/sqlite*
+ -rm -rf $(STAGING_DIR)/usr/lib/pkgconfig/sqlite*
-rm -rf $(TARGET_DIR)/usr/lib/libsqlite*
-rm -rf $(TARGET_DIR)/usr/bin/sqlite3