diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-06-25 14:53:24 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-06-25 14:53:24 +0000 |
| commit | 27f55ff4701f53f2190551ef730a8f65d8a37689 (patch) | |
| tree | 0674fdec0d763aabafd3d54df44ac943f94afe8a /package/bzip2/bzip2.mk | |
| parent | e1d4dc1d8eeebd9d6a83dd0614518a1ad9cb7a13 (diff) | |
- bump version and correct installation path
Diffstat (limited to 'package/bzip2/bzip2.mk')
| -rw-r--r-- | package/bzip2/bzip2.mk | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk index cd6bb7283..de0fcc973 100644 --- a/package/bzip2/bzip2.mk +++ b/package/bzip2/bzip2.mk @@ -3,7 +3,7 @@ # bzip2 # ############################################################# -BZIP2_VER:=1.0.3 +BZIP2_VER:=1.0.4 BZIP2_SOURCE:=bzip2-$(BZIP2_VER).tar.gz BZIP2_SITE:=http://www.bzip.org/$(BZIP2_VER) BZIP2_DIR:=$(BUILD_DIR)/bzip2-$(BZIP2_VER) @@ -27,23 +27,24 @@ ifneq ($(BR2_LARGEFILE),y) endif $(SED) "s:-O2:$(TARGET_CFLAGS):" $(BZIP2_DIR)/Makefile $(SED) "s:-O2:$(TARGET_CFLAGS):" $(BZIP2_DIR)/Makefile-libbz2_so - touch $(BZIP2_DIR)/.unpacked + touch $@ $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VER): $(BZIP2_DIR)/.unpacked $(TARGET_CONFIGURE_OPTS) \ $(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) -C $(BZIP2_DIR) -f Makefile-libbz2_so $(TARGET_CONFIGURE_OPTS) \ $(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) -C $(BZIP2_DIR) libbz2.a - cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/include/ + cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/usr/include/ cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VER) $(STAGING_DIR)/lib/ - cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/lib/ - (cd $(STAGING_DIR)/lib/; ln -snf libbz2.so.$(BZIP2_VER) libbz2.so) - (cd $(STAGING_DIR)/lib/; ln -snf libbz2.so.$(BZIP2_VER) libbz2.so.1.0) + cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/usr/lib/ + (cd $(STAGING_DIR)/usr/lib/ ; ln -snf ../../lib/libbz2.so.$(BZIP2_VER) libbz2.so) + (cd $(STAGING_DIR)/lib ; ln -snf libbz2.so.$(BZIP2_VER) libbz2.so.1.0; \ + ln -snf libbz2.so.$(BZIP2_VER) libbz2.so.1) $(BZIP2_BINARY): $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VER) $(TARGET_CONFIGURE_OPTS) \ $(MAKE) CC=$(TARGET_CC) -C $(BZIP2_DIR) bzip2 bzip2recover - touch -c $(BZIP2_BINARY) + touch -c $@ $(BZIP2_TARGET_BINARY): $(BZIP2_BINARY) (cd $(TARGET_DIR)/usr/bin; \ @@ -68,21 +69,25 @@ $(BZIP2_TARGET_BINARY): $(BZIP2_BINARY) $(TARGET_DIR)/usr/lib/libbz2.a: $(STAGING_DIR)/lib/libbz2.a mkdir -p $(TARGET_DIR)/usr/include - cp $(STAGING_DIR)/include/bzlib.h $(TARGET_DIR)/usr/include/ + cp $(STAGING_DIR)/usr/include/bzlib.h $(TARGET_DIR)/usr/include/ cp $(STAGING_DIR)/lib/libbz2.a $(TARGET_DIR)/usr/lib/ rm -f $(TARGET_DIR)/lib/libbz2.so (cd $(TARGET_DIR)/usr/lib; \ ln -fs /usr/lib/libbz2.so.1.0 libbz2.so; \ ) -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libbz2.so.1.0 - touch -c $(TARGET_DIR)/usr/lib/libbz2.a + touch -c $@ 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 + -$(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.* -$(MAKE) -C $(BZIP2_DIR) clean bzip2-dirclean: |