7 files changed, 30 insertions, 30 deletions

diff --git a/noncore/tools/calc2/binary/binary.pro b/noncore/tools/calc2/binary/binary.pro
index 01ba6a4..2e9ed78 100644
--- a/noncore/tools/calc2/binary/binary.pro
+++ b/noncore/tools/calc2/binary/binary.pro
@@ -6,11 +6,11 @@ CONFIG += qt release
 INTERFACES += binary.ui
 HEADERS = binaryimpl.h \
             binaryfactory.h 
 SOURCES = binaryimpl.cpp \
             binaryfactory.cpp
 
-INCLUDEPATH     += $(QPEDIR)/include \
-                    $(QPEDIR)/calc2
-DEPENDPATH      += $(QPEDIR)/include 
+INCLUDEPATH     += $(OPIEDIR)/include \
+                    $(OPIEDIR)/calc2
+DEPENDPATH      += $(OPIEDIR)/include 
 
-DESTDIR = $(QPEDIR)/plugins/calculator
+DESTDIR = $(OPIEDIR)/plugins/calculator
diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro
index c10232a..00e13b7 100644
--- a/noncore/tools/calc2/calc.pro
+++ b/noncore/tools/calc2/calc.pro
@@ -2,10 +2,10 @@ TEMPLATE = app
 CONFIG += qt release
 
 # Input
 HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h
 SOURCES += calc.cpp main.cpp engine.cpp
 
-INCLUDEPATH     += $(QPEDIR)/include 
-DEPENDPATH      += $(QPEDIR)/include 
+INCLUDEPATH     += $(OPIEDIR)/include 
+DEPENDPATH      += $(OPIEDIR)/include 
 LIBS += -lqpe -Wl,-export-dynamic 
 
diff --git a/noncore/tools/calc2/simple/simple.pro b/noncore/tools/calc2/simple/simple.pro
index 92378a6..9e5d4e0 100644
--- a/noncore/tools/calc2/simple/simple.pro
+++ b/noncore/tools/calc2/simple/simple.pro
@@ -4,11 +4,11 @@ CONFIG += qt release
 
 # Input
 INTERFACES += simple.ui
 HEADERS = simpleimpl.h  simplefactory.h stdinstructions.h
 SOURCES = simpleimpl.cpp simplefactory.cpp
 
-INCLUDEPATH     += $(QPEDIR)/include \
-                    $(QPEDIR)/calc2
-DEPENDPATH      += $(QPEDIR)/include 
+INCLUDEPATH     += $(OPIEDIR)/include \
+                    $(OPIEDIR)/calc2
+DEPENDPATH      += $(OPIEDIR)/include 
 
-DESTDIR = $(QPEDIR)/plugins/calculator
+DESTDIR = $(OPIEDIR)/plugins/calculator
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
@@ -3,21 +3,21 @@
 ####### 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)
 
@@ -101,23 +101,23 @@ REQUIRES=
 
 ####### 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 \
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,13 +1,13 @@
-        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
 
 TRANSLATIONS = ../i18n/de/calculator.ts
diff --git a/noncore/tools/clock/Makefile.in b/noncore/tools/clock/Makefile.in
index adda9e6..efa7808 100644
--- a/noncore/tools/clock/Makefile.in
+++ b/noncore/tools/clock/Makefile.in
@@ -3,21 +3,21 @@
 ####### 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= clock
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
@@ -97,20 +97,20 @@ REQUIRES=
 
 
 ####### Compile
 
 clock.o: clock.cpp \
                 clock.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/timestring.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/timestring.h
 
 main.o: main.cpp \
                 clock.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
 moc_clock.o: moc_clock.cpp \
                 clock.h
 
 moc_clock.cpp: clock.h
         $(MOC) clock.h -o moc_clock.cpp
diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro
index 97f4d2c..ec27adc 100644
--- a/noncore/tools/clock/clock.pro
+++ b/noncore/tools/clock/clock.pro
@@ -1,13 +1,13 @@
         TEMPLATE= app
         CONFIG  = qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         HEADERS         = clock.h
         SOURCES         = clock.cpp \
                   main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
         INTERFACES= 
         TARGET  = clock
 
 TRANSLATIONS = ../i18n/de/clock.ts