readd $(HOST_CONFIGURE_VARS) to Host/Configure/Default, missed in r14699

[openwrt.git] / include / toplevel.mk

diff --git a/include/toplevel.mk b/include/toplevel.mk
index ab4448a..eaaf6d3 100644 (file)
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -23,6 +23,8 @@ export RELEASE
 export REVISION
 export OPENWRTVERSION
 export IS_TTY=$(shell tty -s && echo 1 || echo 0)
 export REVISION
 export OPENWRTVERSION
 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

 
 # 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=


@@ -75,7 +77,7 @@ oldconfig: scripts/config/conf prepare-tmpinfo FORCE
        $< -$(if $(CONFDEFAULT),$(CONFDEFAULT),o) Config.in
 
 menuconfig: scripts/config/mconf prepare-tmpinfo FORCE
        $< -$(if $(CONFDEFAULT),$(CONFDEFAULT),o) Config.in
 
 menuconfig: scripts/config/mconf prepare-tmpinfo FORCE

-       if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \
+       if [ \! -e .config -a -e $(HOME)/.openwrt/defconfig ]; then \

                cp $(HOME)/.openwrt/defconfig .config; \
        fi
        $< Config.in
                cp $(HOME)/.openwrt/defconfig .config; \
        fi
        $< Config.in