Changeset 338

Show
Ignore:
Timestamp:
07/22/06 03:02:42 (2 years ago)
Author:
tg
Message:

install sed into lbin/ like pax to prevent rare
issues on BSD

agreed wbx@

also remove dead code from when we didn't always
build GNU sed ourselves

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/tools/Makefile

    r329 r338  
    1313 
    1414all: install 
    15 install: check-pax $(TARGETS_INSTALL) 
     15install: check-lbin $(TARGETS_INSTALL) 
    1616clean: $(TARGETS_CLEAN) 
    1717 
    18 check-pax: 
     18check-lbin: 
     19        @[ -e ${TOPDIR}/lbin/sed ] || \ 
     20            rm -f $(TOOLS_STAMP_DIR)/.tools_sed-install 
    1921        @[ -e ${TOPDIR}/lbin/pax ] || \ 
    2022            rm -f $(TOOLS_STAMP_DIR)/.tools_paxmirabilis-install 

  • trunk/freewrt/tools/sed/Makefile

    r316 r338  
    4242            rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \ 
    4343                    $(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc; fi 
    44         @ln -sf $(STAGING_DIR)/$(PKG_TARGET_BINARY) $(TOPDIR)/lbin/sed 
    4544 
    46 use-sed-host-binary: 
    47         @if [ -x /usr/bin/sed ]; then SED="/usr/bin/sed"; else \ 
    48             if [ -x /bin/sed ]; then SED="/bin/sed"; fi; fi; \ 
    49             mkdir -p $(STAGING_DIR)/bin; \ 
    50             rm -f $(STAGING_DIR)/$(PKG_TARGET_BINARY); \ 
    51             ln -s $$SED $(STAGING_DIR)/$(PKG_TARGET_BINARY) 
     45install-lbin: ${WRKBUILD}/${PKG_BINARY} 
     46        install -c -s -m 555 ${WRKBUILD}/${PKG_BINARY} ${TOPDIR}/lbin/sed 
    5247 
    5348source:  
    5449prepare:  
    5550compile:  
    56 install: build-sed-host-binary 
     51install: build-sed-host-binary install-lbin 
    5752clean:  
    5853        rm -rf $(WRKBUILD)