2 files changed, 20 insertions, 6 deletions

diff --git a/Makefile.test b/Makefile.test
index b917c32..daa6d35 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -5,6 +5,12 @@ export QMAKE:=$(OPIEDIR)/qmake/qmake
 
 export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
 
+noconfig_targets := xconfig menuconfig config oldconfig randconfig \
+                    defconfig allyesconfig allnoconfig allmodconfig \
+                    clean mrproper distclean \
+                    help tags TAGS sgmldocs psdocs pdfdocs htmldocs \
+                    checkconfig checkhelp checkincludes
+
 configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/core/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/config.in $(TOPDIR)/noncore/todayplugins/config.in $(TOPDIR)/config.in
 
 # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
@@ -78,13 +84,18 @@ defconfig :
 
 export
 
-ifneq ($(filter-out config menuconfig xconfig randconfig allyesconfig allnoconfig defconfig,$(MAKECMDGOALS)),)
+ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
+
+export include-config := 1
+
 -include $(TOPDIR)/.config
--include $(TOPDIR)/..config.cmd
 -include $(TOPDIR)/.depends
+
 endif
 
-export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE))
+-include $(TOPDIR)/..config.cmd
+
+export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
 
 all clean: $(subdir-y)
 
diff --git a/config.in.in b/config.in.in
index 41998d4..7af1f17 100644
--- a/config.in.in
+++ b/config.in.in
@@ -36,10 +36,13 @@ endchoice
 
 config SPECFILE
   string
-  default "linux-generic-g++" if TARGET_X86
-  default "linux-sharp-g++" if TARGET_SHARP
+  default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
+  default "linux-g++" if TARGET_X86 && X11
+  default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
+  default "linux-g++" if TARGET_SHARP && X11
 #  default "linux-oz-g++" if TARGET_OZ
-  default "linux-ipaq-g++" if TARGET_IPAQ
+  default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
+  default "linux-g++" if TARGET_IPAQ && X11
 
 config CUSTOMFILE
   string