author | kergoth <kergoth> | 2002-11-05 21:46:36 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-05 21:46:36 (UTC) |
commit | 1d3654e884ac4236279a24e10b7aa60efa87f449 (patch) (side-by-side diff) | |
tree | 7585a66c901899646b484c8b9eb473060748340e /Makefile.test | |
parent | 808fd6176bcbb19360dc5185c4cff5113678d06a (diff) | |
download | opie-1d3654e884ac4236279a24e10b7aa60efa87f449.zip opie-1d3654e884ac4236279a24e10b7aa60efa87f449.tar.gz opie-1d3654e884ac4236279a24e10b7aa60efa87f449.tar.bz2 |
Add scripts/kconfig to LD_LIBRARY_PATH for qconf call
-rw-r--r-- | Makefile.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.test b/Makefile.test index 61d8a56..434f3ca 100644 --- a/Makefile.test +++ b/Makefile.test @@ -14,65 +14,66 @@ configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(TOPDIR)/core/applet # # NOTE: The order in which things happen in this makefile is # -critical-. Do not rearrange this! all : $(TOPDIR)/.config $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends clean-configs : $(TOPDIR)/.depends.cfgs @echo "Wiping generated config.in files..." @-rm -f $(configs) -include $(TOPDIR)/.depends.cfgs all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) $(call descend,scripts/kconfig,conf) @if [ ! -e $@ ]; then \ cp $(TOPDIR)/def-configs/opie $@; \ fi; @$(MAKE) -C scripts/kconfig conf; ./scripts/kconfig/conf -s ./config.in # config rules must have the $(configs) var defined # at the time that they run. we must ensure that .depends.cfgs # is built and included by the time we reach this point. xconfig : $(call descend,scripts/kconfig,qconf) - ./scripts/kconfig/qconf ./config.in + LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ + ./scripts/kconfig/qconf ./config.in menuconfig : scripts/lxdialog/lxdialog $(call descend,scripts/kconfig,mconf) ./scripts/kconfig/mconf ./config.in config : $(call descend,scripts/kconfig,conf) ./scripts/kconfig/conf ./config.in oldconfig : $(call descend,scripts/kconfig,conf) ./scripts/kconfig/conf -o ./config.in randconfig : $(call descend,scripts/kconfig,conf) ./scripts/kconfig/conf -r ./config.in allyesconfig : $(call descend,scripts/kconfig,conf) ./scripts/kconfig/conf -y ./config.in allnoconfig : $(call descend,scripts/kconfig,conf) ./scripts/kconfig/conf -n ./config.in defconfig : $(call descend,scripts/kconfig,conf) ./scripts/kconfig/conf -d ./config.in ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean) -include $(TOPDIR)/.config |