diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-03-21 08:04:19 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-03-21 08:04:19 +0000 |
| commit | 1b5a21dab5da219cda3f421d097dd5afcc4c24a5 (patch) | |
| tree | 6d670c749f21131658a1ea5ac4308e548699ad01 | |
| parent | 4fc1724e27a7e327e1999f617ea3d602cc4b1ff1 (diff) | |
- install target headers into the correct dir
- make sure not to create libwhatever...old cruft
| -rw-r--r-- | package/readline/readline.mk | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/package/readline/readline.mk b/package/readline/readline.mk index dfb2ae296..af7b2141f 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -20,7 +20,7 @@ $(READLINE_DIR)/.unpacked: $(DL_DIR)/$(READLINE_SOURCE) mkdir -p $(READLINE_DIR) tar -C $(BUILD_DIR) -zxf $(DL_DIR)/$(READLINE_SOURCE) $(CONFIG_UPDATE) $(READLINE_DIR) - touch $(READLINE_DIR)/.unpacked + touch $@ $(READLINE_DIR)/.configured: $(READLINE_DIR)/.unpacked (cd $(READLINE_DIR); rm -rf config.cache; \ @@ -45,29 +45,30 @@ $(READLINE_DIR)/.configured: $(READLINE_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ ); - touch $(READLINE_DIR)/.configured + touch $@ $(READLINE_DIR)/$(READLINE_BINARY): $(READLINE_DIR)/.configured $(MAKE) -C $(READLINE_DIR) - touch -c $(READLINE_DIR)/$(READLINE_BINARY) + touch -c $@ $(STAGING_DIR)/$(READLINE_TARGET_BINARY): $(READLINE_DIR)/.configured $(MAKE) -C $(READLINE_DIR) install - touch -c $(STAGING_DIR)/$(READLINE_TARGET_BINARY) + touch -c $@ # Install to Staging area $(STAGING_DIR)/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 $(STAGING_DIR)/include/readline/readline.h - + $(MAKE1) DESTDIR=$(STAGING_DIR) -C $(READLINE_DIR) install + touch -c $@ # Install to Target directory -$(TARGET_DIR)/include/readline/readline.h: $(READLINE_DIR)/$(READLINE_BINARY) +$(TARGET_DIR)/$(READLINE_TARGET_BINARY): $(READLINE_DIR)/$(READLINE_BINARY) + # make sure we don't end up with lib{readline,hostory}...old + $(MAKE1) DESTDIR=$(TARGET_DIR) includedir=/usr/include \ + -C $(READLINE_DIR) uninstall BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" CC=$(TARGET_CC) \ - $(MAKE1) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) install-shared \ - uninstall-doc - touch -c $(TARGET_DIR)/include/readline/readline.h + $(MAKE1) DESTDIR=$(TARGET_DIR) includedir=/usr/include \ + -C $(READLINE_DIR) install-shared uninstall-doc readline: $(STAGING_DIR)/include/readline/readline.h @@ -78,10 +79,11 @@ readline-clean: readline-dirclean: rm -rf $(READLINE_DIR) -readline-target: $(TARGET_DIR)/include/readline/readline.h +readline-target: $(TARGET_DIR)/$(READLINE_TARGET_BINARY) readline-target-clean: - $(MAKE1) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) uninstall + $(MAKE1) DESTDIR=$(TARGET_DIR) includedir=/usr/include \ + -C $(READLINE_DIR) uninstall ifeq ($(strip $(BR2_READLINE)),y) TARGETS+=readline |