2 files changed, 8 insertions, 8 deletions

diff --git a/noncore/net/mail/libmailwrapper/libmailwrapper.pro b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
index 5e44064..befadd7 100644
--- a/noncore/net/mail/libmailwrapper/libmailwrapper.pro
+++ b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
@@ -1,3 +1,3 @@
 TEMPLATE        = lib
-CONFIG        += qt warn_on 
+CONFIG        += qt warn_on
 
@@ -53,6 +53,6 @@ include ( $(OPIEDIR)/include.pro )
 !isEmpty( LIBETPAN_INC_DIR ) {
-        INCLUDEPATH += $$LIBETPAN_INC_DIR
+    INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH
 }
 !isEmpty( LIBETPAN_LIB_DIR ) {
-        LIBS += -L$$LIBETPAN_LIB_DIR
+    LIBS = -L$$LIBETPAN_LIB_DIR $$LIBS
 }
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index a3328cb..c88923f 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -19,3 +19,3 @@ HEADERS         = defines.h \
                nntpgroupsdlg.h
-               
+
 SOURCES         = main.cpp \
@@ -38,3 +38,3 @@ SOURCES         = main.cpp \
                nntpgroupsdlg.cpp
-               
+
 INTERFACES     = editaccountsui.ui \
@@ -52,3 +52,3 @@ INTERFACES     = editaccountsui.ui \
                nntpgroupsui.ui
-        
+
 
@@ -67,6 +67,6 @@ include ( $(OPIEDIR)/include.pro )
 !isEmpty( LIBETPAN_INC_DIR ) {
-        INCLUDEPATH += $$LIBETPAN_INC_DIR
+    INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH
 }
 !isEmpty( LIBETPAN_LIB_DIR ) {
-        LIBS += -Wl,-rpath-link,$$LIBETPAN_LIB_DIR
+    LIBS = -Wl,-rpath-link,$$LIBETPAN_LIB_DIR $$LIBS
 }