X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fbzip2;h=89f0ca7adcddd464e65937848f7a15c4d4744480;hb=11e78f38b9fe0e5087dd59ef76782cd39bd8f197;hp=4712f31d593f34fcfdd69d1d2336552868358417;hpb=1b8e5968dfa332010c0029953f7a27df129843c6;p=ipfire-2.x.git diff --git a/lfs/bzip2 b/lfs/bzip2 index 4712f31d59..89f0ca7adc 100644 --- a/lfs/bzip2 +++ b/lfs/bzip2 @@ -24,14 +24,14 @@ include Config -VER = 1.0.5 +VER = 1.0.6 THISAPP = bzip2-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -# Normal build or /tools build. +# Normal build or $(TOOLS_DIR) build. # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3c15a0c8d1d3ee1c46a1634d00617b1a +$(DL_FILE)_MD5 = 00b516f4704d4a7cb50a1d97e6e8e15b install : $(TARGET) @@ -82,7 +82,7 @@ ifeq "$(ROOT)" "" cd $(DIR_APP) && make -f Makefile-libbz2_so cd $(DIR_APP) && make clean cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && make install PREFIX=/usr cd $(DIR_APP) && cp -v bzip2-shared /bin/bzip2 cd $(DIR_APP) && cp -av libbz2.so* /lib ln -sfv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so @@ -90,7 +90,7 @@ ifeq "$(ROOT)" "" ln -sfv bzip2 /bin/bzcat else cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make PREFIX=/tools install + cd $(DIR_APP) && make PREFIX=$(TOOLS_DIR) install endif @rm -rf $(DIR_APP) @$(POSTBUILD)