stop build when an error occurs and when BUILDLOG is set (#5160)

[openwrt.git] / tools / sed / Makefile

diff --git a/tools/sed/Makefile b/tools/sed/Makefile
index b316991..6b3122d 100644 (file)
--- a/tools/sed/Makefile
+++ b/tools/sed/Makefile
@@ -13,51 +13,20 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/$(PKG_NAME)
 PKG_MD5SUM:=928f0e06422f414091917401f1a834d0
 PKG_CAT:=zcat
 PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/$(PKG_NAME)
 PKG_MD5SUM:=928f0e06422f414091917401f1a834d0
 PKG_CAT:=zcat

-
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-HOST_SED_TARGET=$(strip $(shell ./sedcheck.sh))
-
-ifneq ($(HOST_SED_TARGET),build-sed-host-binary)
-  PKG_SOURCE:=
-  PKG_CAT:=
-endif
+export SED:=

 
 include $(INCLUDE_DIR)/host-build.mk
 
 
 include $(INCLUDE_DIR)/host-build.mk
 

-ifeq ($(HOST_SED_TARGET),build-sed-host-binary)
-  define Build/Configure
-       (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
-               ./configure \
-               --prefix=$(STAGING_DIR) \
-               --prefix=/usr \
-       );
-  endef
+define Host/Compile
+       $(MAKE) -C $(HOST_BUILD_DIR) SHELL="$(BASH)"
+endef

 
 

-  define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)
-  endef
+define Host/Install
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/sed/sed $(STAGING_DIR_HOST)/bin/
+endef

 
 

-  define Build/Install
-       @if [ -L $(STAGING_DIR)/bin/sed ] ; then \
-               rm -f $(STAGING_DIR)/bin/sed; fi;
-       @if [ ! -f $(STAGING_DIR)/bin/sed -o $(STAGING_DIR)/bin/sed -ot $(PKG_BUILD_DIR)/sed/sed ]; then \
-           set -x; \
-           mkdir -p $(STAGING_DIR)/bin; \
-           $(MAKE) DESTDIR=$(STAGING_DIR) -C $(PKG_BUILD_DIR) install; \
-           mv $(STAGING_DIR)/usr/bin/sed $(STAGING_DIR)/bin/; \
-           rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \
-                   $(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc; \
-       fi
-  endef
-else
-  define Build/Compile
-  endef
-  define Build/Install
-    rm -rf $(STAGING_DIR)/bin/sed
-       mkdir -p $(STAGING_DIR)/bin
-       ln -s `which sed` $(STAGING_DIR)/bin/sed
-  endef
-endif
+define Host/Clean
+       rm -f $(STAGING_DIR_HOST)/bin/sed
+endef

 
 $(eval $(call HostBuild))
 
 $(eval $(call HostBuild))