Sorry about the flood on the cvs ml list, but this uses OPIEDIR to locate include.pro rather than a relative path.. then you dont have to alter the .pro when restructuring cvs.

5 files changed, 5 insertions, 5 deletions

diff --git a/core/settings/button/button.pro b/core/settings/button/button.pro
index 95a5c91..e757da9 100644
--- a/core/settings/button/button.pro
+++ b/core/settings/button/button.pro
@@ -15,25 +15,25 @@ INTERFACES   = remapdlgbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopie
 TARGET       = buttonsettings
 
 TRANSLATIONS = ../../../i18n/de/buttonsettings.ts \
 	 ../../../i18n/xx/buttonsettings.ts \
 	 ../../../i18n/en/buttonsettings.ts \
 	 ../../../i18n/es/buttonsettings.ts \
 	 ../../../i18n/fr/buttonsettings.ts \
 	 ../../../i18n/hu/buttonsettings.ts \
 	 ../../../i18n/ja/buttonsettings.ts \
 	 ../../../i18n/ko/buttonsettings.ts \
 	 ../../../i18n/no/buttonsettings.ts \
 	 ../../../i18n/pl/buttonsettings.ts \
 	 ../../../i18n/pt/buttonsettings.ts \
 	 ../../../i18n/pt_BR/buttonsettings.ts \
 	 ../../../i18n/sl/buttonsettings.ts \
 	 ../../../i18n/zh_CN/buttonsettings.ts \
 	 ../../../i18n/zh_TW/buttonsettings.ts \
 	 ../../../i18n/da/buttonsettings.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro
index a189a2b..2eb3dad 100644
--- a/core/settings/citytime/citytime.pro
+++ b/core/settings/citytime/citytime.pro
@@ -7,25 +7,25 @@ SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormali
 TARGET = citytime
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 
 TRANSLATIONS = ../../../i18n/de/citytime.ts \
 	 ../../../i18n/xx/citytime.ts \
 	 ../../../i18n/en/citytime.ts \
 	 ../../../i18n/es/citytime.ts \
 	 ../../../i18n/fr/citytime.ts \
 	 ../../../i18n/hu/citytime.ts \
 	 ../../../i18n/ja/citytime.ts \
 	 ../../../i18n/ko/citytime.ts \
 	 ../../../i18n/no/citytime.ts \
 	 ../../../i18n/pl/citytime.ts \
 	 ../../../i18n/pt/citytime.ts \
 	 ../../../i18n/pt_BR/citytime.ts \
 	 ../../../i18n/sl/citytime.ts \
 	 ../../../i18n/zh_CN/citytime.ts \
 	 ../../../i18n/zh_TW/citytime.ts \
 	 ../../../i18n/da/citytime.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/settings/launcher/launcher.pro b/core/settings/launcher/launcher.pro
index 1c17eff..e532852 100644
--- a/core/settings/launcher/launcher.pro
+++ b/core/settings/launcher/launcher.pro
@@ -2,25 +2,25 @@ TEMPLATE     = app
 CONFIG      += qt warn_on release
 DESTDIR      = $(OPIEDIR)/bin
 HEADERS      = launchersettings.h \
                tabssettings.h \
                taskbarsettings.h \
                menusettings.h \
                tabconfig.h \
                tabdialog.h
 
 SOURCES      = main.cpp \
                launchersettings.cpp \
                tabssettings.cpp \
                taskbarsettings.cpp \
                menusettings.cpp \
                tabdialog.cpp
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopie
 TARGET       = launchersettings
 
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro
index 95e7632..2577c98 100644
--- a/core/settings/light-and-power/light-and-power.pro
+++ b/core/settings/light-and-power/light-and-power.pro
@@ -8,25 +8,25 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= ../$(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TARGET		= light-and-power
 
 TRANSLATIONS = ../../../i18n/de/light-and-power.ts \
 	 ../../../i18n/xx/light-and-power.ts \
 	 ../../../i18n/en/light-and-power.ts \
 	 ../../../i18n/es/light-and-power.ts \
 	 ../../../i18n/fr/light-and-power.ts \
 	 ../../../i18n/hu/light-and-power.ts \
 	 ../../../i18n/ja/light-and-power.ts \
 	 ../../../i18n/ko/light-and-power.ts \
 	 ../../../i18n/no/light-and-power.ts \
 	 ../../../i18n/pl/light-and-power.ts \
 	 ../../../i18n/pt/light-and-power.ts \
 	 ../../../i18n/pt_BR/light-and-power.ts \
 	 ../../../i18n/sl/light-and-power.ts \
 	 ../../../i18n/zh_CN/light-and-power.ts \
 	 ../../../i18n/zh_TW/light-and-power.ts \
 	 ../../../i18n/it/light-and-power.ts \
 	 ../../../i18n/da/light-and-power.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index 4564522..dbb4099 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -7,25 +7,25 @@ INTERFACES	= securitybase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
 TARGET		= security
 
 TRANSLATIONS = ../../../i18n/de/security.ts \
 	 ../../../i18n/xx/security.ts \
 	 ../../../i18n/en/security.ts \
 	 ../../../i18n/es/security.ts \
 	 ../../../i18n/fr/security.ts \
 	 ../../../i18n/hu/security.ts \
 	 ../../../i18n/ja/security.ts \
 	 ../../../i18n/ko/security.ts \
 	 ../../../i18n/no/security.ts \
 	 ../../../i18n/pl/security.ts \
 	 ../../../i18n/pt/security.ts \
 	 ../../../i18n/pt_BR/security.ts \
 	 ../../../i18n/sl/security.ts \
 	 ../../../i18n/zh_CN/security.ts \
 	 ../../../i18n/zh_TW/security.ts \
 	 ../../../i18n/da/security.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )