summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2005-07-27 10:55:38 +0000
committerEric Andersen <andersen@codepoet.org>2005-07-27 10:55:38 +0000
commit80063131599eeff504cc4ea138ab0c37f5645ed5 (patch)
tree06f77aea4e8c910c313d2c97ef43f889e146ba42 /package
parenta2c326396a43ecbc8d02c3d815d4010a7ba2e004 (diff)
Fix broken dependancies
Diffstat (limited to 'package')
-rw-r--r--package/readline/readline.mk18
1 files changed, 14 insertions, 4 deletions
diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index e9289e720..2f0c22e65 100644
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -8,8 +8,8 @@ READLINE_SITE:=ftp://ftp.cwru.edu/pub/bash
READLINE_SOURCE:=readline-$(READLINE_VER).tar.gz
READLINE_DIR:=$(BUILD_DIR)/readline-$(READLINE_VER)
READLINE_CAT:=zcat
-READLINE_BINARY:=libhistory.so.$(READLINE_VER)
-READLINE_TARGET_BINARY:=$(TARGET_DIR)/lib/$(READLINE_BINARY)
+READLINE_BINARY:=libhistory.a
+READLINE_TARGET_BINARY:=lib/$(READLINE_BINARY)
@@ -31,18 +31,21 @@ $(READLINE_DIR)/.configured: $(READLINE_DIR)/.unpacked
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=$(STAGING_DIR) \
+ --disable-shared \
);
touch $(READLINE_DIR)/.configured
$(READLINE_DIR)/$(READLINE_BINARY): $(READLINE_DIR)/.configured
$(MAKE) -C $(READLINE_DIR)
+ touch -c $(READLINE_DIR)/$(READLINE_BINARY)
$(STAGING_DIR)/$(READLINE_TARGET_BINARY): $(READLINE_DIR)/.configured
$(MAKE) -C $(READLINE_DIR) install
+ touch -c $(STAGING_DIR)/$(READLINE_TARGET_BINARY)
# Install to Staging area
-readline: $(READLINE_DIR)/.configured
+$(STAGING_DIR)/include/readline/readline.h: $(READLINE_DIR)/$(READLINE_BINARY)
BUILD_CC=$(TARGET_CC) HOSTCC=$(HOSTCC) CC=$(TARGET_CC) \
$(MAKE1) \
prefix=$(STAGING_DIR) \
@@ -58,14 +61,21 @@ readline: $(READLINE_DIR)/.configured
mandir=$(STAGING_DIR)/man \
includedir=$(STAGING_DIR)/include \
-C $(READLINE_DIR) install;
+ touch -c $(STAGING_DIR)/include/readline/readline.h
+
# Install only run-time to Target directory
-readline-target: $(READLINE_DIR)/.configured
+$(TARGET_DIR)/include/readline/readline.h: $(READLINE_DIR)/$(READLINE_BINARY)
BUILD_CC=$(TARGET_CC) HOSTCC=$(HOSTCC) CC=$(TARGET_CC) \
$(MAKE1) \
prefix=$(TARGET_DIR) \
libdir=$(TARGET_DIR)/lib \
-C $(READLINE_DIR) install-shared
+ touch -c $(TARGET_DIR)/include/readline/readline.h
+
+readline: $(STAGING_DIR)/include/readline/readline.h
+
+readline-target: $(TARGET_DIR)/include/readline/readline.h
readline-clean:
$(MAKE) -C $(READLINE_DIR) uninstall