summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Voltz <john.voltz@gmail.com>2008-03-06 18:22:31 +0000
committerJohn Voltz <john.voltz@gmail.com>2008-03-06 18:22:31 +0000
commit51fa46ed29cde0865b833737d0f5cae3a9fbf678 (patch)
tree75bb373431df6267d8bde5789aa4e209f10ee576
parentbe3e3db717602f4baded5b8db2f742f6651b1be6 (diff)
downloadbuildroot-novena-51fa46ed29cde0865b833737d0f5cae3a9fbf678.tar.gz
buildroot-novena-51fa46ed29cde0865b833737d0f5cae3a9fbf678.zip
fixes for readline makefile
-rw-r--r--package/readline/readline.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index 4506ca1f4..d06d81b51 100644
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -10,8 +10,8 @@ READLINE_DIR:=$(BUILD_DIR)/readline-$(READLINE_VERSION)
READLINE_CAT:=$(ZCAT)
READLINE_BINARY:=libhistory.a
READLINE_SHARED_BINARY:=libhistory.so
-READLINE_TARGET_BINARY:=lib/$(READLINE_BINARY)
-READLINE_TARGET_SHARED_BINARY:=lib/$(READLINE_SHARED_BINARY)
+READLINE_TARGET_BINARY:=usr/lib/$(READLINE_BINARY)
+READLINE_TARGET_SHARED_BINARY:=usr/lib/$(READLINE_SHARED_BINARY)
$(DL_DIR)/$(READLINE_SOURCE):
$(WGET) -P $(DL_DIR) $(READLINE_SITE)/$(READLINE_SOURCE)
@@ -39,7 +39,7 @@ $(READLINE_DIR)/.configured: $(READLINE_DIR)/.unpacked
--exec-prefix=/usr \
--bindir=/usr/bin \
--sbindir=/usr/sbin \
- --libdir=/lib \
+ --libdir=/usr/lib \
--libexecdir=/usr/lib \
--sysconfdir=/etc \
--datadir=/usr/share \
@@ -73,8 +73,8 @@ $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY): $(READLINE_DIR)/$(READLINE_BINAR
BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" CC=$(TARGET_CC) \
$(MAKE1) DESTDIR=$(TARGET_DIR) \
-C $(READLINE_DIR) install-shared uninstall-doc
- chmod 775 $(TARGET_DIR)/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/lib/libhistory.so.$(READLINE_VERSION)
- $(STRIPCMD) $(TARGET_DIR)/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/lib/libhistory.so.$(READLINE_VERSION)
+ chmod 775 $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
+ $(STRIPCMD) $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
ifneq ($(strip $(BR2_PACKAGE_READLINE_HEADERS)),y)
rm -rf $(TARGET_DIR)/usr/include/readline
endif