From 63fbd32beb733cc0e959baedbc6fcacb7a225a69 Mon Sep 17 00:00:00 2001 From: Manuel Novoa III Date: Thu, 31 May 2001 21:38:42 +0000 Subject: Install ldd and ldconfig as appropriate. --- Makefile | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3de16caf9..44eaa59be 100644 --- a/Makefile +++ b/Makefile @@ -154,10 +154,14 @@ install_target: ifeq ($(DO_SHARED),shared) install -d $(TARGET_PREFIX)$(ROOT_DIR)/lib cp -fa lib/*.so* $(TARGET_PREFIX)$(ROOT_DIR)/lib; -#ifeq ($(LDSO_PRESENT), $(TARGET_ARCH)) -# install -d $(TARGET_PREFIX)$(ROOT_DIR)/etc +ifeq ($(LDSO_PRESENT), $(TARGET_ARCH)) + install -d $(TARGET_PREFIX)$(ROOT_DIR)/etc + install -d $(TARGET_PREFIX)$(ROOT_DIR)/sbin + install -d $(TARGET_PREFIX)$(ROOT_DIR)/usr/bin + cp ldso/util/ldd $(TARGET_PREFIX)$(ROOT_DIR)/usr/bin + cp ldso/util/ldconfig $(TARGET_PREFIX)$(ROOT_DIR)/sbin # -@if [ -x ldso/util/ldconfig ] ; then ldso/util/ldconfig; fi -#endif +endif endif # Installs development library and headers @@ -169,6 +173,14 @@ install_dev: cp -fa lib/*.so* $(DEVEL_PREFIX)$(ROOT_DIR)/lib; install -d $(DEVEL_PREFIX)$(ROOT_DIR)/usr/lib cp -fa lib/*.[ao] $(DEVEL_PREFIX)$(ROOT_DIR)/usr/lib; +ifeq ($(LDSO_PRESENT), $(TARGET_ARCH)) + install -d $(DEVEL_PREFIX)$(ROOT_DIR)/etc + install -d $(DEVEL_PREFIX)$(ROOT_DIR)/sbin + install -d $(DEVEL_PREFIX)$(ROOT_DIR)/usr/bin + cp ldso/util/ldd $(DEVEL_PREFIX)$(ROOT_DIR)/usr/bin + cp ldso/util/ldconfig $(DEVEL_PREFIX)$(ROOT_DIR)/sbin +# -@if [ -x ldso/util/ldconfig ] ; then ldso/util/ldconfig; fi +endif install -d $(DEVEL_PREFIX)$(ROOT_DIR)/etc install -d $(DEVEL_PREFIX)$(ROOT_DIR)/usr/include install -d $(DEVEL_PREFIX)$(ROOT_DIR)/usr/include/bits -- cgit v1.2.3