2 files changed, 23 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 10df035..8551f28 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,5 @@ configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPD
 all : $(TOPDIR)/.config
 
-STRIP=arm-linux-strip
-
-ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE
+ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config
 	@find $(OPIEDIR)/ -type f -name \*.control | ( for ctrl in `cat`; do \
 		prerm=`echo $$ctrl|sed -e 's,\.control$$,.prerm,'`; \
@@ -108,11 +106,4 @@ endif
 SUBDIRS = $(subdir-y)
 
-export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
-
-ifdef CONFIG_OPTIMIZATIONS
-export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
-export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
-endif
-
 all clean install ipk: $(SUBDIRS) 
 
diff --git a/Vars.make b/Vars.make
index eac5cea..b1cdb28 100644
--- a/Vars.make
+++ b/Vars.make
@@ -12,4 +12,8 @@ ifeq ($(IPK_DIR),)
 endif
 
+ifneq ($(wildcard $(TOPDIR)/.config),)
+    include $(TOPDIR)/.config
+endif
+
 export QMAKE:=$(OPIEDIR)/qmake/qmake
 export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
@@ -62,2 +66,20 @@ export QTE_VERSION
 
 export PATH:=$(OPIEDIR)/scripts:$(PATH)
+export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
+
+ifdef CONFIG_OPTIMIZATIONS
+export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
+export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
+endif
+
+ifeq ($(STRIP),)
+    ifneq ($(CONFIG_TARGET_X86),)
+        STRIP=strip
+    endif
+    ifneq ($(CONFIG_TARGET_IPAQ),)
+        STRIP=arm-linux-strip
+    endif
+    ifneq ($(CONFIG_TARGET_SHARP),)
+        STRIP=arm-linux-strip
+    endif
+endif