2 files changed, 10 insertions, 10 deletions

diff --git a/noncore/tools/calculator/Makefile.in b/noncore/tools/calculator/Makefile.in
index d62b046..ba78df5 100644
--- a/noncore/tools/calculator/Makefile.in
+++ b/noncore/tools/calculator/Makefile.in
@@ -6,7 +6,7 @@ CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
         CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
         CC      =$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/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) $(SYSCONF_LIBS_QTAPP)
         MOC     =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC	=	$(SYSCONF_UIC)
 
 ####### Target
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
@@ -104,17 +104,17 @@ REQUIRES=
 calculatorimpl.o: calculatorimpl.cpp \
                 calculatorimpl.h \
                 calculator.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/qmath.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/qmath.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
 main.o: main.cpp \
                 calculatorimpl.h \
                 calculator.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
 calculator.h: calculator.ui
-        $(UIC) calculator.ui -o calculator.h
+        $(UIC) calculator.ui -o $(INTERFACE_DECL_PATH)/calculator.h
 
 calculator.cpp: calculator.ui
         $(UIC) calculator.ui -i calculator.h -o calculator.cpp
diff --git a/noncore/tools/calculator/calculator.pro b/noncore/tools/calculator/calculator.pro
index 1281fd5..9554d2a 100644
--- a/noncore/tools/calculator/calculator.pro
+++ b/noncore/tools/calculator/calculator.pro
@@ -1,11 +1,11 @@
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         TEMPLATE= app
         CONFIG  = qt warn_on release
         HEADERS         = calculatorimpl.h
         SOURCES         = calculatorimpl.cpp \
                   main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
         INTERFACES= calculator.ui
         TARGET  = calculator