summaryrefslogtreecommitdiff
path: root/package/readline
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-04-16 18:51:20 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-04-16 18:51:20 +0000
commit41decaa9fea506c08f210f411710951f4920b91d (patch)
treef84d747585e23d96842ff43f272016e2d0e2d0ef /package/readline
parent0f620a15c57ceceabd761429a03240ccf97fd3c7 (diff)
- install some more stuff that goes into staging_dir into the proper place.
First hunk of fixes for bug #1290
Diffstat (limited to 'package/readline')
-rw-r--r--package/readline/readline.mk18
1 files changed, 8 insertions, 10 deletions
diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index dcf39b8b6..8606ab753 100644
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -41,14 +41,14 @@ $(READLINE_DIR)/.configured: $(READLINE_DIR)/.unpacked
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
);
touch $@
$(READLINE_DIR)/$(READLINE_BINARY): $(READLINE_DIR)/.configured
- $(MAKE) -C $(READLINE_DIR)
+ $(MAKE) -C $(READLINE_DIR)
touch -c $@
$(STAGING_DIR)/$(READLINE_TARGET_BINARY): $(READLINE_DIR)/.configured
@@ -56,7 +56,7 @@ $(STAGING_DIR)/$(READLINE_TARGET_BINARY): $(READLINE_DIR)/.configured
touch -c $@
# Install to Staging area
-$(STAGING_DIR)/include/readline/readline.h: $(READLINE_DIR)/$(READLINE_BINARY)
+$(STAGING_DIR)/usr/include/readline/readline.h: $(READLINE_DIR)/$(READLINE_BINARY)
BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" CC=$(TARGET_CC) \
$(MAKE1) DESTDIR=$(STAGING_DIR) -C $(READLINE_DIR) install
touch -c $@
@@ -64,16 +64,15 @@ $(STAGING_DIR)/include/readline/readline.h: $(READLINE_DIR)/$(READLINE_BINARY)
# Install to Target directory
$(TARGET_DIR)/$(READLINE_TARGET_BINARY): $(READLINE_DIR)/$(READLINE_BINARY)
# make sure we don't end up with lib{readline,history}...old
- $(MAKE1) DESTDIR=$(TARGET_DIR) includedir=/usr/include \
- -C $(READLINE_DIR) uninstall
+ $(MAKE1) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) uninstall
BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" CC=$(TARGET_CC) \
- $(MAKE1) DESTDIR=$(TARGET_DIR) includedir=/usr/include \
+ $(MAKE1) DESTDIR=$(TARGET_DIR) \
-C $(READLINE_DIR) install-shared uninstall-doc
-readline: $(STAGING_DIR)/include/readline/readline.h
+readline: $(STAGING_DIR)/usr/include/readline/readline.h
readline-clean:
- $(MAKE) -C $(READLINE_DIR) uninstall
+ $(MAKE) -C $(READLINE_DIR) DESTDIR=$(STAGING_DIR) uninstall
-$(MAKE) -C $(READLINE_DIR) clean
readline-dirclean:
@@ -82,8 +81,7 @@ readline-dirclean:
readline-target: $(TARGET_DIR)/$(READLINE_TARGET_BINARY)
readline-target-clean:
- $(MAKE1) DESTDIR=$(TARGET_DIR) includedir=/usr/include \
- -C $(READLINE_DIR) uninstall
+ $(MAKE1) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) uninstall
ifeq ($(strip $(BR2_READLINE)),y)
TARGETS+=readline