diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-09-17 12:30:31 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-09-17 12:30:31 +0000 |
| commit | e4c6340a949f64e6fc0294a1e41cf05dbaa82df9 (patch) | |
| tree | 12a7f94b8461feec5eb1ad87481ddb06eb6834f8 /package/bzip2/bzip2.mk | |
| parent | b14ff970126831720990961f0a7e2fd5f019365d (diff) | |
| download | buildroot-e4c6340a949f64e6fc0294a1e41cf05dbaa82df9.tar.gz buildroot-e4c6340a949f64e6fc0294a1e41cf05dbaa82df9.zip | |
- cleanup and fixes (Cristian Ionescu-Idbohrn)
Diffstat (limited to 'package/bzip2/bzip2.mk')
| -rw-r--r-- | package/bzip2/bzip2.mk | 59 |
1 files changed, 38 insertions, 21 deletions
diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk index fcf0d9f2da..0454d3126e 100644 --- a/package/bzip2/bzip2.mk +++ b/package/bzip2/bzip2.mk @@ -31,15 +31,21 @@ endif $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) -C $(BZIP2_DIR) -f Makefile-libbz2_so + $(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) \ + -C $(BZIP2_DIR) -f Makefile-libbz2_so $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) -C $(BZIP2_DIR) libbz2.a + $(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) \ + -C $(BZIP2_DIR) libbz2.a cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/usr/include/ cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/lib/ cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/usr/lib/ - (cd $(STAGING_DIR)/usr/lib/; ln -snf ../../lib/libbz2.so.$(BZIP2_VERSION) libbz2.so) - (cd $(STAGING_DIR)/lib; ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \ - ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1) + (cd $(STAGING_DIR)/usr/lib/; \ + ln -snf ../../lib/libbz2.so.$(BZIP2_VERSION) libbz2.so; \ + ) + (cd $(STAGING_DIR)/lib; \ + ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \ + ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1; \ + ) $(BZIP2_BINARY): $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION) $(TARGET_CONFIGURE_OPTS) \ @@ -48,24 +54,34 @@ $(BZIP2_BINARY): $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION) $(BZIP2_TARGET_BINARY): $(BZIP2_BINARY) (cd $(TARGET_DIR)/usr/bin; \ - rm -f bzip2 bunzip2 bzcat bzip2recover bzgrep bzegrep bzfgrep bzmore bzless bzdiff bzcmp) + rm -f bzip2 bunzip2 bzcat bzip2recover \ + bzgrep bzegrep bzfgrep bzmore bzless bzdiff bzcmp; \ + ) $(TARGET_CONFIGURE_OPTS) \ $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(BZIP2_DIR) install rm -f $(TARGET_DIR)/usr/lib/libbz2.a rm -f $(TARGET_DIR)/usr/include/bzlib.h cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(TARGET_DIR)/usr/lib/ (cd $(TARGET_DIR)/usr/lib; \ - ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \ - ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so) + ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \ + ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \ + ) (cd $(TARGET_DIR)/usr/bin; \ - ln -snf bzip2 bunzip2; \ - ln -snf bzip2 bzcat; \ - ln -snf bzdiff bzcmp; \ - ln -snf bzmore bzless; \ - ln -snf bzgrep bzegrep; \ - ln -snf bzgrep bzfgrep;) - rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc + ln -snf bzip2 bunzip2; \ + ln -snf bzip2 bzcat; \ + ln -snf bzdiff bzcmp; \ + ln -snf bzmore bzless; \ + ln -snf bzgrep bzegrep; \ + ln -snf bzgrep bzfgrep; \ + ) +ifneq ($(BR2_HAVE_INFOPAGES),y) + rm -rf $(TARGET_DIR)/usr/info +endif +ifneq ($(BR2_HAVE_MANPAGES),y) + rm -rf $(TARGET_DIR)/usr/man +endif + rm -rf $(TARGET_DIR)/share/locale + rm -rf $(TARGET_DIR)/usr/share/doc $(TARGET_DIR)/usr/lib/libbz2.a: $(STAGING_DIR)/lib/libbz2.a mkdir -p $(TARGET_DIR)/usr/include @@ -83,11 +99,12 @@ bzip2-headers: $(TARGET_DIR)/usr/lib/libbz2.a bzip2: uclibc $(BZIP2_TARGET_BINARY) bzip2-clean: - -$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BZIP2_DIR) uninstall - rm -f $(TARGET_DIR)/usr/lib/libbz2.* $(TARGET_DIR)/lib/libbz2.* \ - $(TARGET_DIR)/usr/include/bzlib.h \ - $(STAGING_DIR)/usr/include/bzlib.h \ - $(STAGING_DIR)/usr/lib/libbz2.* $(STAGING_DIR)/lib/libbz2.* + rm -f $(addprefix $(TARGET_DIR),/lib/libbz2.* \ + /usr/lib/libbz2.* \ + /usr/include/bzlib.h) + rm -f $(addprefix $(STAGING_DIR),/lib/libbz2.* \ + /usr/lib/libbz2.* \ + /usr/include/bzlib.h) -$(MAKE) -C $(BZIP2_DIR) clean bzip2-dirclean: |
