Changeset 1629

Show
Ignore:
Timestamp:
07/12/06 22:24:43 (2 years ago)
Author:
justin
Message:

Upgraded unzip instructions as in BLFS SVN.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/cross/packages/unzip/Makefile

    r1373 r1629  
    99SHA-$(FILE)= d3d0b410f51b98dae3b056b5e9768fccb1402beb 
    1010 
    11 PATCH1= $(DIR)-fix_Makefile-1.patch 
    12 URL-$(PATCH1)= $(HTTPBLFS)/$(NM)/$(PATCH1) 
    13 SHA-$(PATCH1)= 48f4cbbc21f2562a6957dcf7532df6f84c3b1cdc 
    14  
    15 PATCH2= $(DIR)-fix_libz-1.patch 
    16 URL-$(PATCH2)= $(HTTPBLFS)/$(NM)/$(PATCH2) 
    17 SHA-$(PATCH2)= 166a01de3d461d9083846f542a625b1c5f87634b 
    18  
    19 PATCH3= $(DIR)-dont_make_noise-1.patch 
    20 URL-$(PATCH3)= $(HTTPBLFS)/$(NM)/$(PATCH3) 
    21 SHA-$(PATCH3)= 9e8f063e70370968a860d3bddeb37c43391f7a3c 
    22  
    2311# Targets 
    2412 
    … …  
    2917        'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' 
    3018 
    31 stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH3) 
     19stage2: Makefile $(FILE) 
    3220        $(std_build) 
    3321 
    3422compile-stage2: 
    35         patch -Np1 -i ../$(PATCH1) 
    36         patch -Np1 -i ../$(PATCH2) 
    37         patch -Np1 -i ../$(PATCH3) 
    38         cp unix/Makefile . 
    3923ifneq ($(LFS-ARCH),x86) 
    40         make prefix=/usr LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_noasm 
     24        make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_noasm 
    4125else 
    42         make prefix=/usr LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux 
    43         make prefix=/usr LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_shlibz 
     26        make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux 
    4427endif 
    4528        make prefix=/usr install 
    46 ifeq ($(LFS-ARCH),x86) 
    47         cp -d libunzip.so* /usr/lib 
    48 endif 
    4929 
    5030clean: