6 files changed, 21 insertions, 21 deletions

diff --git a/core/settings/citytime/Makefile.in b/core/settings/citytime/Makefile.in
index b058021..4112a68 100644
--- a/core/settings/citytime/Makefile.in
+++ b/core/settings/citytime/Makefile.in
@@ -1,65 +1,65 @@
 #############################################################################
 
 ####### 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= citytime
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
         HEADERS =citytime.h \
                 zonemap.h \
                 sun.h \
                 stylusnormalizer.h
         SOURCES =citytime.cpp \
                 zonemap.cpp \
                 main.cpp \
                 sun.c \
                 stylusnormalizer.cpp
         OBJECTS =citytime.o \
                 zonemap.o \
                 main.o \
                 sun.o \
                 stylusnormalizer.o \
                 citytimebase.o
 INTERFACES =    citytimebase.ui
 UICDECLS =      citytimebase.h
 UICIMPLS =      citytimebase.cpp
         SRCMOC  =moc_citytime.cpp \
                 moc_zonemap.cpp \
                 moc_stylusnormalizer.cpp \
                 moc_citytimebase.cpp
         OBJMOC  =moc_citytime.o \
                 moc_zonemap.o \
                 moc_stylusnormalizer.o \
                 moc_citytimebase.o
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
@@ -74,111 +74,111 @@ OBJMOC	=	moc_citytime.o \
 
 
 all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
         $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 moc: $(SRCMOC)
 
 tmake:
         tmake citytime.pro
 
 clean:
         -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
         -rm -f *~ core
         -rm -f allmoc.cpp
 
 ####### Extension Modules
 
 listpromodules:
         @echo 
 
 listallmodules:
         @echo 
 
 listaddonpromodules:
         @echo 
 
 listaddonentmodules:
         @echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 citytime.o: citytime.cpp \
                 zonemap.h \
                 stylusnormalizer.h \
                 citytime.h \
                 citytimebase.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/timestring.h \
-                $(QPEDIR)/include/qpe/tzselect.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/timestring.h \
+                $(OPIEDIR)/include/qpe/tzselect.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
 zonemap.o: zonemap.cpp \
                 sun.h \
                 zonemap.h \
                 stylusnormalizer.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/timestring.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/timestring.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
 main.o: main.cpp \
                 citytime.h \
                 citytimebase.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
 sun.o: sun.c \
                 sun.h \
-                $(QPEDIR)/include/qpe/qmath.h
+                $(OPIEDIR)/include/qpe/qmath.h
 
 stylusnormalizer.o: stylusnormalizer.cpp \
                 stylusnormalizer.h
 
 citytimebase.h: citytimebase.ui
         $(UIC) citytimebase.ui -o $(INTERFACE_DECL_PATH)/citytimebase.h
 
 citytimebase.cpp: citytimebase.ui
         $(UIC) citytimebase.ui -i citytimebase.h -o citytimebase.cpp
 
 citytimebase.o: citytimebase.cpp \
                 citytimebase.h \
                 citytimebase.ui
 
 moc_citytime.o: moc_citytime.cpp \
                 citytime.h \
                 citytimebase.h
 
 moc_zonemap.o: moc_zonemap.cpp \
                 zonemap.h \
                 stylusnormalizer.h
 
 moc_stylusnormalizer.o: moc_stylusnormalizer.cpp \
                 stylusnormalizer.h
 
 moc_citytimebase.o: moc_citytimebase.cpp \
                 citytimebase.h
 
 moc_citytime.cpp: citytime.h
         $(MOC) citytime.h -o moc_citytime.cpp
 
 moc_zonemap.cpp: zonemap.h
         $(MOC) zonemap.h -o moc_zonemap.cpp
 
 moc_stylusnormalizer.cpp: stylusnormalizer.h
         $(MOC) stylusnormalizer.h -o moc_stylusnormalizer.cpp
 
 moc_citytimebase.cpp: citytimebase.h
         $(MOC) citytimebase.h -o moc_citytimebase.cpp
 
 
diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro
index d988b48..3420499 100644
--- a/core/settings/citytime/citytime.pro
+++ b/core/settings/citytime/citytime.pro
@@ -1,13 +1,13 @@
 # $Id$
 CONFIG += qt warn_on release
 TEMPLATE = app
-DESTDIR         = $(QPEDIR)/bin
+DESTDIR         = $(OPIEDIR)/bin
 INTERFACES = citytimebase.ui
 HEADERS = citytime.h zonemap.h sun.h stylusnormalizer.h
 SOURCES = citytime.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp
 TARGET = citytime
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH      += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 
 TRANSLATIONS = ../i18n/de/citytime.ts
diff --git a/core/settings/light-and-power/Makefile.in b/core/settings/light-and-power/Makefile.in
index 8236ed0..5caa249 100644
--- a/core/settings/light-and-power/Makefile.in
+++ b/core/settings/light-and-power/Makefile.in
@@ -1,57 +1,57 @@
 #############################################################################
 
 ####### 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 = ../../bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
         TARGET= light-and-power
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
         HEADERS =settings.h
         SOURCES =light.cpp \
                 main.cpp
         OBJECTS =light.o \
                 main.o \
                 lightsettingsbase.o
 INTERFACES =    lightsettingsbase.ui
 UICDECLS =      lightsettingsbase.h
 UICIMPLS =      lightsettingsbase.cpp
         SRCMOC  =moc_settings.cpp \
                 moc_lightsettingsbase.cpp
         OBJMOC  =moc_settings.o \
                 moc_lightsettingsbase.o
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro
index 87bb111..35b51a7 100644
--- a/core/settings/light-and-power/light-and-power.pro
+++ b/core/settings/light-and-power/light-and-power.pro
@@ -1,12 +1,12 @@
         TEMPLATE= app
         CONFIG  += qt warn_on release
         DESTDIR         = ../../bin
         HEADERS         = settings.h
         SOURCES         = light.cpp main.cpp
         INTERFACES= lightsettingsbase.ui
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= ../$(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
         TARGET  = light-and-power
 
 TRANSLATIONS   = ../../i18n/de/light-and-power.ts
diff --git a/core/settings/security/Makefile.in b/core/settings/security/Makefile.in
index 803edc5..f190e79 100644
--- a/core/settings/security/Makefile.in
+++ b/core/settings/security/Makefile.in
@@ -1,57 +1,57 @@
 #############################################################################
 
 ####### 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 = ../../bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
         TARGET= security
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
         HEADERS =security.h
         SOURCES =security.cpp \
                 main.cpp
         OBJECTS =security.o \
                 main.o \
                 securitybase.o
 INTERFACES =    securitybase.ui
 UICDECLS =      securitybase.h
 UICIMPLS =      securitybase.cpp
         SRCMOC  =moc_security.cpp \
                 moc_securitybase.cpp
         OBJMOC  =moc_security.o \
                 moc_securitybase.o
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index 282127e..f22e7a6 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -1,12 +1,12 @@
         TEMPLATE= app
         CONFIG  += qt warn_on release
         DESTDIR         = ../../bin
         HEADERS         = security.h
         SOURCES         = security.cpp main.cpp
         INTERFACES= securitybase.ui
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= ../$(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
         TARGET  = security
 
 TRANSLATIONS   = ../../i18n/de/security.ts