1 files changed, 7 insertions, 7 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
@@ -1,41 +1,41 @@
 #############################################################################
 
 ####### Compiler, tools and options
 
         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)
         UIC     =$(SYSCONF_UIC)
 
 ####### Target
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
         TARGET= calculator
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
         HEADERS =calculatorimpl.h
         SOURCES =calculatorimpl.cpp \
                 main.cpp
         OBJECTS =calculatorimpl.o \
                 main.o \
                 calculator.o
 INTERFACES =    calculator.ui
 UICDECLS =      calculator.h
 UICIMPLS =      calculator.cpp
         SRCMOC  =moc_calculatorimpl.cpp \
                 moc_calculator.cpp
         OBJMOC  =moc_calculatorimpl.o \
                 moc_calculator.o
 
 
 ####### Implicit rules
@@ -83,57 +83,57 @@ listpromodules:
 listallmodules:
         @echo 
 
 listaddonpromodules:
         @echo 
 
 listaddonentmodules:
         @echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 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
 
 calculator.o: calculator.cpp \
                 calculator.h \
                 calculator.ui
 
 moc_calculatorimpl.o: moc_calculatorimpl.cpp \
                 calculatorimpl.h \
                 calculator.h
 
 moc_calculator.o: moc_calculator.cpp \
                 calculator.h
 
 moc_calculatorimpl.cpp: calculatorimpl.h
         $(MOC) calculatorimpl.h -o moc_calculatorimpl.cpp
 
 moc_calculator.cpp: calculator.h
         $(MOC) calculator.h -o moc_calculator.cpp