- use lib and inlcude dir from dependencies before the other dir's

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,8 +1,8 @@
 TEMPLATE        = lib
-CONFIG        += qt warn_on 
+CONFIG        += qt warn_on
 
 HEADERS         = mailwrapper.h \
                imapwrapper.h \
                mailtypes.h \
                pop3wrapper.h \
                abstractmail.h  \
@@ -48,11 +48,11 @@ contains( $(CONFIG_TARGET_MACOSX), y ){
 DESTDIR      = $(OPIEDIR)/lib
 TARGET       = mailwrapper
 
 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
@@ -14,13 +14,13 @@ HEADERS         = defines.h \
                statuswidget.h \
                newmaildir.h \
                selectstore.h \
                selectsmtp.h \
                nntpgroups.h \
                nntpgroupsdlg.h
-               
+
 SOURCES         = main.cpp \
                opiemail.cpp \
                mainwindow.cpp \
                accountview.cpp \
                accountitem.cpp \
                composemail.cpp \
@@ -33,13 +33,13 @@ SOURCES         = main.cpp \
                statuswidget.cpp \
                newmaildir.cpp \
                selectstore.cpp \
                selectsmtp.cpp \
                nntpgroups.cpp \
                nntpgroupsdlg.cpp
-               
+
 INTERFACES     = editaccountsui.ui \
                selectmailtypeui.ui \
                imapconfigui.ui \
                pop3configui.ui \
                nntpconfigui.ui \
                smtpconfigui.ui \
@@ -47,13 +47,13 @@ INTERFACES     = editaccountsui.ui \
                composemailui.ui \
                settingsdialogui.ui \
                statuswidgetui.ui \
                newmaildirui.ui \
                selectstoreui.ui \
                nntpgroupsui.ui
-	
+
 
 INCLUDEPATH += $(OPIEDIR)/include /usr/local/include
 
 CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
 contains( CONFTEST, y ){
     LIBS        += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lmailwrapper -liconv -lopiemm2
@@ -62,11 +62,11 @@ contains( CONFTEST, y ){
 }
 
 TARGET       = opiemail
 
 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
 }