fix typo in squashfs-lzma patch (thx, hauke)

[openwrt.git] / include / toplevel.mk

diff --git a/include/toplevel.mk b/include/toplevel.mk
index 9dfc9df..78a03d8 100644 (file)
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -26,6 +26,9 @@ export IS_TTY=$(shell tty -s && echo 1 || echo 0)
 export LD_LIBRARY_PATH:=$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib
 export DYLD_LIBRARY_PATH:=$(if $(DYLD_LIBRARY_PATH),$(DYLD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib
 
 export LD_LIBRARY_PATH:=$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib
 export DYLD_LIBRARY_PATH:=$(if $(DYLD_LIBRARY_PATH),$(DYLD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib
 

+# prevent perforce from messing with the patch utility
+unexport P4PORT P4USER P4CONFIG P4CLIENT
+

 # make sure that a predefined CFLAGS variable does not disturb packages
 export CFLAGS=
 
 # make sure that a predefined CFLAGS variable does not disturb packages
 export CFLAGS=
 


@@ -82,10 +85,19 @@ menuconfig: scripts/config/mconf prepare-tmpinfo FORCE
        fi
        $< Config.in
 
        fi
        $< Config.in
 

-kernel_oldconfig: .config FORCE
+prepare_kernel_conf: .config FORCE
+
+ifeq ($(wildcard staging_dir/host/bin/sed),)
+  prepare_kernel_conf:
+       @+$(SUBMAKE) -r tools/sed/install
+else
+  prepare_kernel_conf: ;
+endif
+
+kernel_oldconfig: prepare_kernel_conf

        $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux oldconfig
 
        $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux oldconfig
 

-kernel_menuconfig: .config FORCE
+kernel_menuconfig: prepare_kernel_conf

        $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux menuconfig
 
 tmp/.prereq-build: include/prereq-build.mk
        $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux menuconfig
 
 tmp/.prereq-build: include/prereq-build.mk