fix wrong submenu for kmod-leds-wrap

[openwrt.git] / include / host-build.mk

diff --git a/include/host-build.mk b/include/host-build.mk
index f4b6b44..581c2cf 100644 (file)
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -5,13 +5,18 @@
 # See /LICENSE for more information.
 #
 
 # See /LICENSE for more information.
 #
 

+PKG_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
+PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/host-install
+

 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
 include $(INCLUDE_DIR)/depends.mk
 
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
 include $(INCLUDE_DIR)/depends.mk
 

-STAMP_PREPARED:=$(PKG_BUILD_DIR)/.prepared_$(shell find ${CURDIR} $(PKG_FILE_DEPEND) $(DEP_FINDPARAMS) | md5s)
+STAMP_PREPARED:=$(PKG_BUILD_DIR)/.prepared_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),))

 STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
 STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
 STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
 STAMP_BUILT:=$(PKG_BUILD_DIR)/.built

+STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.$(PKG_NAME)_installed
+

 override MAKEFLAGS=
 
 include $(INCLUDE_DIR)/quilt.mk
 override MAKEFLAGS=
 
 include $(INCLUDE_DIR)/quilt.mk


@@ -33,24 +38,19 @@ define Build/Configure/Default
        [ -x configure ] && \
                $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/$(3)/ && \
                $(2) \
        [ -x configure ] && \
                $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/$(3)/ && \
                $(2) \

-               CPPFLAGS="-I$(STAGING_DIR)/host/include" \
-               LDFLAGS="-L$(STAGING_DIR)/host/lib" \
+               CPPFLAGS="$(HOST_CFLAGS)" \
+               LDFLAGS="$(HOST_LDFLAGS)" \
+               SHELL="$(BASH)" \

                ./configure \
                ./configure \

-               --target=$(GNU_TARGET_NAME) \
-               --host=$(GNU_TARGET_NAME) \
+               --target=$(GNU_HOST_NAME) \
+               --host=$(GNU_HOST_NAME) \

                --build=$(GNU_HOST_NAME) \
                --program-prefix="" \
                --program-suffix="" \
                --build=$(GNU_HOST_NAME) \
                --program-prefix="" \
                --program-suffix="" \

-               --prefix=/usr \
-               --exec-prefix=/usr \
-               --bindir=/usr/bin \
-               --sbindir=/usr/sbin \
-               --libexecdir=/usr/lib \
-               --sysconfdir=/etc \
-               --datadir=/usr/share \
-               --localstatedir=/var \
-               --mandir=/usr/man \
-               --infodir=/usr/info \
+               --prefix=$(STAGING_DIR_HOST) \
+               --exec-prefix=$(STAGING_DIR_HOST) \
+               --sysconfdir=$(STAGING_DIR_HOST)/etc \
+               --localstatedir=$(STAGING_DIR_HOST)/var \

                $(DISABLE_NLS) \
                $(1); \
                true; \
                $(DISABLE_NLS) \
                $(1); \
                true; \


@@ -82,9 +82,8 @@ endif
 
 ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)
   define HostBuild/Autoclean
 
 ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)
   define HostBuild/Autoclean

-    $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED)

     $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED))
     $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED))

-    $(if $(filter prepare,$(MAKECMDGOALS)),,$(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT),$(PKG_BUILD_DIR)/.dep_files, -and -not -path "/.*" -and -not -path "*/ipkg*"))
+    $(if $(if $(Build/Compile),$(filter prepare,$(MAKECMDGOALS)),1),,$(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT)))

   endef
 endif
 
   endef
 endif
 


@@ -107,19 +106,19 @@ define HostBuild
        $(call Build/Compile)
        touch $$@
 
        $(call Build/Compile)
        touch $$@
 

-  $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed: $(STAMP_BUILT)
+  $(STAMP_INSTALLED): $(STAMP_BUILT)

        $(call Build/Install)
        mkdir -p $$(shell dirname $$@)
        touch $$@
        
   ifdef Build/Install
        $(call Build/Install)
        mkdir -p $$(shell dirname $$@)
        touch $$@
        
   ifdef Build/Install

-    install: $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed
+    install: $(STAMP_INSTALLED)

   endif
 
   package-clean: FORCE
        $(call Build/Clean)
        $(call Build/Uninstall)
   endif
 
   package-clean: FORCE
        $(call Build/Clean)
        $(call Build/Uninstall)

-       rm -f $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed
+       rm -f $(STAMP_INSTALLED) $(STAMP_BUILT)

 
   download:
   prepare: $(STAMP_PREPARED)
 
   download:
   prepare: $(STAMP_PREPARED)