2 files changed, 9 insertions, 11 deletions

diff --git a/inputmethods/jumpx/Makefile.in b/inputmethods/jumpx/Makefile.in
index b6347d5..0fabaa5 100644
--- a/inputmethods/jumpx/Makefile.in
+++ b/inputmethods/jumpx/Makefile.in
@@ -3,13 +3,13 @@
 ####### Compiler, tools and options
 
         CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
         CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
         CC      =$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-        INCPATH =-I../../include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
         LIBS    =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
         MOC     =$(SYSCONF_MOC)
         UIC     =$(SYSCONF_UIC)
 
 ####### Target
@@ -62,16 +62,14 @@ all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
         $(SYSCONF_LINK_LIB)
 
 moc: $(SRCMOC)
 
-tmake: Makefile.in
-
-Makefile.in: jumpx.pro
-        tmake jumpx.pro -o Makefile.in
+tmake:
+        tmake jumpx.pro
 
 clean:
         -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
         -rm -f *~ core
         -rm -f allmoc.cpp
 
@@ -100,20 +98,20 @@ REQUIRES=
 
 
 ####### Compile
 
 keyboard.o: keyboard.cpp \
                 keyboard.h \
-                ../../include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/resource.h
 
 keyboardimpl.o: keyboardimpl.cpp \
                 keyboard.h \
                 keyboardimpl.h \
-                ../../include/qpe/inputmethodinterface.h \
-                ../../include/qpe/qcom.h \
-                ../../include/qpe/quuid.h
+                $(OPIEDIR)/include/qpe/inputmethodinterface.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/quuid.h
 
 moc_keyboard.o: moc_keyboard.cpp \
                 keyboard.h
 
 moc_keyboard.cpp: keyboard.h
         $(MOC) keyboard.h -o moc_keyboard.cpp
diff --git a/inputmethods/jumpx/jumpx.pro b/inputmethods/jumpx/jumpx.pro
index 433a798..f4699bd 100644
--- a/inputmethods/jumpx/jumpx.pro
+++ b/inputmethods/jumpx/jumpx.pro
@@ -3,10 +3,10 @@ CONFIG         += qt warn_on release
 HEADERS         = keyboard.h \
                   keyboardimpl.h
 SOURCES         = keyboard.cpp \
                   keyboardimpl.cpp
 TARGET          = qjumpx
 DESTDIR         = ../../plugins/inputmethods
-INCLUDEPATH    += ../../include/qpe
-DEPENDPATH     += ../../include/qpe
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH      += $(OPIEDIR)/include
 LIBS           += -lqpe
 VERSION         = 1.0.0