X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Ftoplevel.mk;h=eaaf6d37d1c6785ec86a7e3e3b68f06146ea8768;hb=7aae9d3725d15216d6f9bf35029d0755f3a1a460;hp=ab4448ae1047411414aeca5fcf748c94d447ce5c;hpb=87e0a3cf0f45f9b2029654b8d2ff154137ca78b2;p=openwrt%2Fstaging%2Fmkresin.git diff --git a/include/toplevel.mk b/include/toplevel.mk index ab4448ae10..eaaf6d37d1 100644 --- 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 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= @@ -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 [ \! -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