Changeset 07526d20 in freewrt for tools

Timestamp:

Jul 22, 2006, 3:02:42 AM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

c2e2d0c

Parents:

054c5fc

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

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@338 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

tools

Files:

• Makefile (modified) (1 diff)
• sed/Makefile (modified) (1 diff)

tools/Makefile

@@ -13 +13 @@
 
 all: install
-install: check-pax $(TARGETS_INSTALL)
+install: check-lbin $(TARGETS_INSTALL)
 clean: $(TARGETS_CLEAN)
 
-check-pax:
+check-lbin:
+        @[ -e ${TOPDIR}/lbin/sed ] || \
+            rm -f $(TOOLS_STAMP_DIR)/.tools_sed-install
         @[ -e ${TOPDIR}/lbin/pax ] || \
             rm -f $(TOOLS_STAMP_DIR)/.tools_paxmirabilis-install

tools/sed/Makefile

@@ -42 +42 @@
             rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \
                     $(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc; fi
-        @ln -sf $(STAGING_DIR)/$(PKG_TARGET_BINARY) $(TOPDIR)/lbin/sed
 
-use-sed-host-binary:
-        @if [ -x /usr/bin/sed ]; then SED="/usr/bin/sed"; else \
-            if [ -x /bin/sed ]; then SED="/bin/sed"; fi; fi; \
-            mkdir -p $(STAGING_DIR)/bin; \
-            rm -f $(STAGING_DIR)/$(PKG_TARGET_BINARY); \
-            ln -s $$SED $(STAGING_DIR)/$(PKG_TARGET_BINARY)
+install-lbin: ${WRKBUILD}/${PKG_BINARY}
+        install -c -s -m 555 ${WRKBUILD}/${PKG_BINARY} ${TOPDIR}/lbin/sed
 
 source: 
 prepare: 
 compile: 
-install: build-sed-host-binary
+install: build-sed-host-binary install-lbin
 clean: 
         rm -rf $(WRKBUILD)