6 files changed, 15 insertions, 15 deletions

diff --git a/noncore/settings/language/Makefile.in b/noncore/settings/language/Makefile.in
index 2babf6e..d1a602d 100644
--- a/noncore/settings/language/Makefile.in
+++ b/noncore/settings/language/Makefile.in
@@ -1,33 +1,33 @@
 #############################################################################
 
 ####### 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= language
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
         HEADERS =settings.h
         SOURCES =language.cpp \
                 main.cpp
         OBJECTS =language.o \
                 main.o \
                 languagesettingsbase.o
 INTERFACES =    languagesettingsbase.ui
 UICDECLS =      languagesettingsbase.h
diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro
index d1f1bf0..c01ffc8 100644
--- a/noncore/settings/language/language.pro
+++ b/noncore/settings/language/language.pro
@@ -1,12 +1,12 @@
         TEMPLATE= app
         CONFIG  += qt warn_on release
         DESTDIR         = ../../bin
         HEADERS         = settings.h
         SOURCES         = language.cpp main.cpp
         INTERFACES= languagesettingsbase.ui
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= ../$(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
         TARGET  = language
 
 TRANSLATIONS    = ../../i18n/de/language.ts 
diff --git a/noncore/settings/sound/Makefile.in b/noncore/settings/sound/Makefile.in
index 1772e12..b42f2e9 100644
--- a/noncore/settings/sound/Makefile.in
+++ b/noncore/settings/sound/Makefile.in
@@ -1,33 +1,33 @@
 #############################################################################
 
 ####### 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= sound
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
         HEADERS =soundsettings.h
         SOURCES =soundsettings.cpp \
                 main.cpp
         OBJECTS =soundsettings.o \
                 main.o \
                 soundsettingsbase.o
 INTERFACES =    soundsettingsbase.ui
 UICDECLS =      soundsettingsbase.h
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro
index 9028a44..44eff44 100644
--- a/noncore/settings/sound/sound.pro
+++ b/noncore/settings/sound/sound.pro
@@ -1,10 +1,10 @@
         TEMPLATE= app
         CONFIG  += qt warn_on release
         DESTDIR         = ../../bin
         HEADERS         = soundsettings.h
         SOURCES         = soundsettings.cpp main.cpp
         INTERFACES= soundsettingsbase.ui
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= ../$(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
         TARGET  = sound
diff --git a/noncore/settings/sysinfo/Makefile.in b/noncore/settings/sysinfo/Makefile.in
index 1149304..fb9d15e 100644
--- a/noncore/settings/sysinfo/Makefile.in
+++ b/noncore/settings/sysinfo/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= sysinfo
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
         HEADERS =memory.h \
                 graph.h \
                 load.h \
                 storage.h \
                 versioninfo.h \
                 sysinfo.h
         SOURCES =main.cpp \
                 memory.cpp \
                 graph.cpp \
                 load.cpp \
                 storage.cpp \
                 versioninfo.cpp \
                 sysinfo.cpp
         OBJECTS =main.o \
                 memory.o \
                 graph.o \
@@ -104,76 +104,76 @@ listpromodules:
 
 listallmodules:
         @echo 
 
 listaddonpromodules:
         @echo 
 
 listaddonentmodules:
         @echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 main.o: main.cpp \
                 sysinfo.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
 memory.o: memory.cpp \
                 graph.h \
                 memory.h
 
 graph.o: graph.cpp \
                 graph.h
 
 load.o: load.cpp \
                 load.h
 
 storage.o: storage.cpp \
                 graph.h \
                 storage.h
 
 versioninfo.o: versioninfo.cpp \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/version.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/version.h \
                 versioninfo.h
 
 sysinfo.o: sysinfo.cpp \
                 memory.h \
                 load.h \
                 storage.h \
                 versioninfo.h \
                 sysinfo.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/resource.h
 
 moc_memory.o: moc_memory.cpp \
                 memory.h
 
 moc_graph.o: moc_graph.cpp \
                 graph.h
 
 moc_load.o: moc_load.cpp \
                 load.h
 
 moc_storage.o: moc_storage.cpp \
                 storage.h
 
 moc_versioninfo.o: moc_versioninfo.cpp \
                 versioninfo.h
 
 moc_sysinfo.o: moc_sysinfo.cpp \
                 sysinfo.h
 
 moc_memory.cpp: memory.h
         $(MOC) memory.h -o moc_memory.cpp
 
 moc_graph.cpp: graph.h
         $(MOC) graph.h -o moc_graph.cpp
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro
index 0c7d907..3393a12 100644
--- a/noncore/settings/sysinfo/sysinfo.pro
+++ b/noncore/settings/sysinfo/sysinfo.pro
@@ -1,25 +1,25 @@
         TEMPLATE= app
         CONFIG  = qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         HEADERS         = memory.h \
                   graph.h \
                   load.h \
                   storage.h \
                   versioninfo.h \
                   sysinfo.h
         SOURCES         = main.cpp \
                   memory.cpp \
                   graph.cpp \
                   load.cpp \
                   storage.cpp \
                   versioninfo.cpp \
                   sysinfo.cpp
         INTERFACES= 
 
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
 
         TARGET  = sysinfo
 
 TRANSLATIONS = ../i18n/de/sysinfo.ts