Fix kpilot build system

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1238887 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

12 files changed, 12 insertions, 12 deletions

diff --git a/conduits/abbrowserconduit/Makefile.am b/conduits/abbrowserconduit/Makefile.am
index b012765..6985522 100644
--- a/conduits/abbrowserconduit/Makefile.am
+++ b/conduits/abbrowserconduit/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 
 kde_module_LTLIBRARIES = conduit_address.la
 
diff --git a/conduits/docconduit/Makefile.am b/conduits/docconduit/Makefile.am
index 77df2b6..ade1c66 100644
--- a/conduits/docconduit/Makefile.am
+++ b/conduits/docconduit/Makefile.am
@@ -5,7 +5,7 @@
 
 SUBDIRS = Icons
 
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 METASOURCES = AUTO
 
 
diff --git a/conduits/knotes/Makefile.am b/conduits/knotes/Makefile.am
index db4cff3..b13a2ff 100644
--- a/conduits/knotes/Makefile.am
+++ b/conduits/knotes/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir) -I$(top_srcdir)/lib $(all_includes)
 
 METASOURCES = AUTO
 
diff --git a/conduits/malconduit/Makefile.am b/conduits/malconduit/Makefile.am
index d8a2224..df5ed04 100644
--- a/conduits/malconduit/Makefile.am
+++ b/conduits/malconduit/Makefile.am
@@ -3,7 +3,7 @@
 ### The mal conduit is Copyright (C) 2002 by Reinhold Kainhofer
 
 
-INCLUDES= $(PISOCK_INCLUDE)  $(MAL_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE)  $(MAL_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
diff --git a/conduits/memofileconduit/Makefile.am b/conduits/memofileconduit/Makefile.am
index e4a244b..1f51105 100644
--- a/conduits/memofileconduit/Makefile.am
+++ b/conduits/memofileconduit/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 
 METASOURCES = AUTO
 
diff --git a/conduits/notepadconduit/Makefile.am b/conduits/notepadconduit/Makefile.am
index d50e4fd..7a052da 100644
--- a/conduits/notepadconduit/Makefile.am
+++ b/conduits/notepadconduit/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 
 METASOURCES = AUTO
 
diff --git a/conduits/null/Makefile.am b/conduits/null/Makefile.am
index c1057b4..783e881 100644
--- a/conduits/null/Makefile.am
+++ b/conduits/null/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 
 METASOURCES = AUTO
 
diff --git a/conduits/popmail/Makefile.am b/conduits/popmail/Makefile.am
index 0e56580..5b6becd 100644
--- a/conduits/popmail/Makefile.am
+++ b/conduits/popmail/Makefile.am
@@ -1,7 +1,7 @@
 ### Makefile for the popmail conduit
 ###
 
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 METASOURCES = AUTO
 
 servicedir  = $(kde_servicesdir)
diff --git a/conduits/recordconduit/Makefile.am b/conduits/recordconduit/Makefile.am
index 33ceb85..9fd691e 100644
--- a/conduits/recordconduit/Makefile.am
+++ b/conduits/recordconduit/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 
 METASOURCES = AUTO
 
diff --git a/conduits/sysinfoconduit/Makefile.am b/conduits/sysinfoconduit/Makefile.am
index eb7f7aa..b89b4df 100644
--- a/conduits/sysinfoconduit/Makefile.am
+++ b/conduits/sysinfoconduit/Makefile.am
@@ -2,7 +2,7 @@
 ###
 ### The sysinfo conduit is Copyright (C) 2003 by Reinhold Kainhofer
 
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
diff --git a/conduits/timeconduit/Makefile.am b/conduits/timeconduit/Makefile.am
index 6a58716..8c9ae93 100644
--- a/conduits/timeconduit/Makefile.am
+++ b/conduits/timeconduit/Makefile.am
@@ -2,7 +2,7 @@
 ###
 ### The time conduit is Copyright (C) 2002 by Reinhold Kainhofer
 
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
diff --git a/conduits/vcalconduit/Makefile.am b/conduits/vcalconduit/Makefile.am
index 546789e..4f0dcd8 100644
--- a/conduits/vcalconduit/Makefile.am
+++ b/conduits/vcalconduit/Makefile.am
@@ -3,7 +3,7 @@
 ### so it seems logical to put them in one place.
 ###
 
-INCLUDES= -I$(top_srcdir)/kpilot/lib -I$(top_srcdir) \
+INCLUDES= -I$(top_srcdir)/lib -I$(top_srcdir) \
 	$(PISOCK_INCLUDE) $(all_includes)
 
 METASOURCES = AUTO