summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-06-21 11:46:34 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-06-21 11:48:16 (GMT)
commit353ebfd0b10caf48a9e7d446860f98507936a426 (patch)
tree9117c825138799394ee800ed492b297c7eda4650
parentb1d02f73146731ce1f14ee81a2e92e3f8ab4d317 (diff)
downloadbuildroot-353ebfd0b10caf48a9e7d446860f98507936a426.tar.gz
buildroot-353ebfd0b10caf48a9e7d446860f98507936a426.tar.bz2
berkeleydb: target install cleanup
Install into /usr/lib and use the normal make install target instead of manually messing around with symlinks and .so versions. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/berkeleydb/berkeleydb.mk24
1 files changed, 8 insertions, 16 deletions
diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index e80f66f..eb20ba9 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -4,10 +4,8 @@
#
#############################################################
BERKELEYDB_VERSION:=4.4.20
-BERKELEYDB_SO_VERSION:=4.4
BERKELEYDB_SITE:=http://download.oracle.com/berkeley-db
BERKELEYDB_SOURCE:=db-$(BERKELEYDB_VERSION).NC.tar.gz
-BERKELEYDB_SHARLIB:=libdb-$(BERKELEYDB_SO_VERSION).so
BERKELEYDB_SUBDIR=build_unix
BERKELEYDB_INSTALL_STAGING = YES
@@ -24,7 +22,7 @@ define BERKELEYDB_CONFIGURE_CMDS
--exec-prefix=/usr \
--bindir=/usr/bin \
--sbindir=/usr/sbin \
- --libdir=/lib \
+ --libdir=/usr/lib \
--libexecdir=/usr/lib \
--sysconfdir=/etc \
--datadir=/usr/share \
@@ -44,20 +42,14 @@ define BERKELEYDB_CONFIGURE_CMDS
$(SED) 's/\.lo/.o/g' $(@D)/build_unix/Makefile
endef
-ifeq ($(BR2_HAVE_DEVFILES),y)
-define BERKELEYDB_INSTALL_TARGET_DEVFILES_CMDS
- cp -dpf $(STAGING_DIR)/usr/include/db.h $(TARGET_DIR)/usr/include/
- cp -dpf $(STAGING_DIR)/lib/libdb*.a $(TARGET_DIR)/usr/lib/
- cp -dpf $(STAGING_DIR)/lib/libdb*.la $(TARGET_DIR)/usr/lib/
-endef
-endif
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
-define BERKELEYDB_INSTALL_TARGET_CMDS
- rm -rf $(TARGET_DIR)/lib/libdb*
- cp -a $(STAGING_DIR)/lib/libdb*so* $(TARGET_DIR)/lib/
- rm -f $(addprefix $(TARGET_DIR)/lib/,libdb.so libdb.la libdb.a)
- (cd $(TARGET_DIR)/usr/lib; ln -fs /lib/$(BERKELEYDB_SHARLIB) libdb.so)
- $(BERKELEYDB_INSTALL_TARGET_DEVFILES_CMDS)
+define BERKELEYDB_REMOVE_DOCS
+ rm -rf $(TARGET_DIR)/usr/docs
endef
+BERKELEYDB_POST_INSTALL_TARGET_HOOKS += BERKELEYDB_REMOVE_DOCS
+
+endif
+
$(eval $(call AUTOTARGETS,package,berkeleydb))