Committing in .

Modified Files:
	configure mkipks addressbook/Makefile.in
	addressbook/addressbook.pro calc2/calc.pro
	calc2/binary/binary.pro calc2/simple/simple.pro
	calculator/Makefile.in calculator/calculator.pro
	cardmon/Makefile.in cardmon/cardmon.pro chess/chess.pro
	citytime/Makefile.in citytime/citytime.pro clock/Makefile.in
	clock/clock.pro datebook/Makefile.in datebook/datebook.pro
	dictionary/dictionary.pro doc/qcop.doc doc/start.doc
	embeddedkonsole/Makefile.in
	embeddedkonsole/embeddedkonsole.pro etc/init.d/qpe
	example/example.pro fifteen/Makefile.in fifteen/fifteen.pro
	filebrowser/Makefile.in filebrowser/filebrowser.pro
	freetype/freetype.pro go/Makefile.in go/go.pro
	helpbrowser/Makefile.in helpbrowser/helpbrowser.pro
	inputmethods/handwriting/Makefile.in
	inputmethods/handwriting/handwriting.pro
	inputmethods/keyboard/Makefile.in
	inputmethods/keyboard/keyboard.pro
	inputmethods/pickboard/Makefile.in
	inputmethods/pickboard/pickboard.pro
	inputmethods/unikeyboard/Makefile.in
	inputmethods/unikeyboard/unikeyboard.pro keypebble/Makefile.in
	keypebble/keypebble.pro library/Makefile.in library/global.cpp
	library/library.pro library/qpeapplication.cpp
	mindbreaker/Makefile.in mindbreaker/mindbreaker.pro
	minesweep/Makefile.in minesweep/minesweep.pro
	mpegplayer/Makefile.in mpegplayer/mpegplayer.pro
	mpegplayer/libflash/libflash.pro mpegplayer/libmad/Makefile.in
	mpegplayer/libmad/libmad.pro mpegplayer/libmpeg3/Makefile.in
	mpegplayer/libmpeg3/libmpeg3.pro
	mpegplayer/libmpeg3/audio/Makefile
	mpegplayer/libmpeg3/video/Makefile
	mpegplayer/wavplugin/Makefile.in
	mpegplayer/wavplugin/wavplugin.pro netsetup/Makefile.in
	netsetup/README netsetup/netsetup.pro
	netsetup/dialup/Makefile.in netsetup/dialup/dialup.pro
	netsetup/lan/Makefile.in netsetup/lan/lan.pro
	parashoot/Makefile.in parashoot/parashoot.pro
	qasteroids/Makefile.in qasteroids/qasteroids.pro
	qcop/Makefile.in qcop/qcop.pro qipkg/Makefile.in
	qipkg/qipkg.pro scripts/q_functions
	settings/appearance/Makefile.in
	settings/appearance/appearance.pro
	settings/language/Makefile.in settings/language/language.pro
	settings/light-and-power/Makefile.in
	settings/light-and-power/light-and-power.pro
	settings/rotation/Makefile.in settings/rotation/rotation.pro
	settings/security/Makefile.in settings/security/security.pro
	settings/sound/Makefile.in settings/sound/sound.pro
	settings/systemtime/Makefile.in
	settings/systemtime/systemtime.pro showimg/Makefile.in
	showimg/showimg.pro single/Makefile.in single/single.pro
	snake/Makefile.in snake/snake.pro solitaire/Makefile.in
	solitaire/solitaire.pro spreadsheet/Makefile.in
	spreadsheet/spreadsheet.pro sysinfo/Makefile.in
	sysinfo/sysinfo.pro tableviewer/tableviewer.pro
	taskbar/Makefile.in taskbar/main.cpp taskbar/taskbar.pro
	taskbar/batteryapplet/Makefile.in
	taskbar/batteryapplet/batteryapplet.pro
	taskbar/clipboardapplet/clipboardapplet.pro
	taskbar/clockapplet/Makefile.in
	taskbar/clockapplet/clockapplet.pro
	taskbar/netmonapplet/Makefile.in
	taskbar/netmonapplet/netmonapplet.pro
	taskbar/volumeapplet/Makefile.in
	taskbar/volumeapplet/volumeapplet.pro tetrix/Makefile.in
	tetrix/tetrix.pro textedit/Makefile.in textedit/textedit.pro
	todo/Makefile.in todo/todo.pro tux/Makefile.in tux/tux.pro
	website/htdocs/build.html website/htdocs/development.html
	website/htdocs/refman/qcop.html
	website/htdocs/refman/qpeapplication.html wordgame/Makefile.in
	wordgame/wordgame.pro
Log Message:
	Changed QPEDIR to OPIEDIR in .pro files, and documentation,
	and regenerated all Makefile.in's that were affected.

2 files changed, 12 insertions, 12 deletions

diff --git a/noncore/unsupported/oipkg/Makefile.in b/noncore/unsupported/oipkg/Makefile.in
index 8dd7edb..a7e22ef 100644
--- a/noncore/unsupported/oipkg/Makefile.in
+++ b/noncore/unsupported/oipkg/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= qipkg
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
         HEADERS =packagemanager.h
         SOURCES =packagemanager.cpp \
                 main.cpp
         OBJECTS =packagemanager.o \
                 main.o \
                 packagemanagerbase.o \
                 pkdesc.o \
                 pkfind.o \
                 pksettings.o
 INTERFACES =    packagemanagerbase.ui \
                 pkdesc.ui \
                 pkfind.ui \
                 pksettings.ui
 UICDECLS =      packagemanagerbase.h \
                 pkdesc.h \
                 pkfind.h \
                 pksettings.h
 UICIMPLS =      packagemanagerbase.cpp \
                 pkdesc.cpp \
                 pkfind.cpp \
                 pksettings.cpp
         SRCMOC  =moc_packagemanager.cpp \
                 moc_packagemanagerbase.cpp \
                 moc_pkdesc.cpp \
                 moc_pkfind.cpp \
                 moc_pksettings.cpp
         OBJMOC  =moc_packagemanager.o \
                 moc_packagemanagerbase.o \
                 moc_pkdesc.o \
                 moc_pkfind.o \
                 moc_pksettings.o
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
@@ -80,107 +80,107 @@ OBJMOC	=	moc_packagemanager.o \
 
 all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
         $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 moc: $(SRCMOC)
 
 tmake:
         tmake qipkg.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
 
 packagemanager.o: packagemanager.cpp \
                 packagemanager.h \
                 packagemanagerbase.h \
                 pkdesc.h \
                 pkfind.h \
                 pksettings.h \
-                $(QPEDIR)/include/qpe/process.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/stringutil.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
-                $(QPEDIR)/include/qpe/applnk.h
+                $(OPIEDIR)/include/qpe/process.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/stringutil.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+                $(OPIEDIR)/include/qpe/applnk.h
 
 main.o: main.cpp \
                 packagemanager.h \
                 packagemanagerbase.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
 packagemanagerbase.h: packagemanagerbase.ui
         $(UIC) packagemanagerbase.ui -o $(INTERFACE_DECL_PATH)/packagemanagerbase.h
 
 packagemanagerbase.cpp: packagemanagerbase.ui
         $(UIC) packagemanagerbase.ui -i packagemanagerbase.h -o packagemanagerbase.cpp
 
 pkdesc.h: pkdesc.ui
         $(UIC) pkdesc.ui -o $(INTERFACE_DECL_PATH)/pkdesc.h
 
 pkdesc.cpp: pkdesc.ui
         $(UIC) pkdesc.ui -i pkdesc.h -o pkdesc.cpp
 
 pkfind.h: pkfind.ui
         $(UIC) pkfind.ui -o $(INTERFACE_DECL_PATH)/pkfind.h
 
 pkfind.cpp: pkfind.ui
         $(UIC) pkfind.ui -i pkfind.h -o pkfind.cpp
 
 pksettings.h: pksettings.ui
         $(UIC) pksettings.ui -o $(INTERFACE_DECL_PATH)/pksettings.h
 
 pksettings.cpp: pksettings.ui
         $(UIC) pksettings.ui -i pksettings.h -o pksettings.cpp
 
 packagemanagerbase.o: packagemanagerbase.cpp
 
 pkdesc.o: pkdesc.cpp
 
 pkfind.o: pkfind.cpp
 
 pksettings.o: pksettings.cpp
 
 moc_packagemanager.o: moc_packagemanager.cpp \
                 packagemanager.h \
                 packagemanagerbase.h
 
 moc_packagemanagerbase.o: moc_packagemanagerbase.cpp \
                 packagemanagerbase.h
 
 moc_pkdesc.o: moc_pkdesc.cpp \
                 pkdesc.h
 
 moc_pkfind.o: moc_pkfind.cpp \
                 pkfind.h
 
 moc_pksettings.o: moc_pksettings.cpp \
                 pksettings.h
diff --git a/noncore/unsupported/oipkg/qipkg.pro b/noncore/unsupported/oipkg/qipkg.pro
index 90d8703..22a37ee 100644
--- a/noncore/unsupported/oipkg/qipkg.pro
+++ b/noncore/unsupported/oipkg/qipkg.pro
@@ -1,13 +1,13 @@
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         TEMPLATE= app
         CONFIG  = qt warn_on release
         HEADERS         = packagemanager.h
         SOURCES         = packagemanager.cpp \
                   main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
         INTERFACES= packagemanagerbase.ui pkdesc.ui pkfind.ui pksettings.ui
         TARGET  = qipkg
 
 TRANSLATIONS = ../i18n/de/qipkg.ts