--- a/CMakeLists.txt	Thu Nov 12 12:46:56 2009 +0200
+++ b/CMakeLists.txt	Fri Jan 15 11:17:42 2010 +0200
@@ -21,15 +21,14 @@
 add_library(marking MODULE marking.c) 
 
 ## User settable options
-set(MCABBER_INCLUDE_DIR "${marking_SOURCE_DIR}/../include" 
-    CACHE FILEPATH "Path to mcabber headers") 
+set(MCABBER_INCLUDE_DIR "/usr/include" CACHE FILEPATH "Path to mcabber headers") 
  
 ## Packaging information
 set(CPACK_PACKAGE_NAME libmcabber-marking)
 set(CPACK_PACKAGE_VERSION "0.0.1")
 set(CPACK_PACKAGE_VENDOR "IsBear")
 set(CPACK_PACKAGE_CONTACT "Myhailo Danylenko <isbear@ukrpost.net>")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mcabber example modularized marking implementation")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mcabber module to do commands with multiple contacts")
 set(CPACK_RESOURCE_FILE_LICENSE ${marking_SOURCE_DIR}/COPYING)
 set(CPACK_SOURCE_GENERATOR TBZ2)
 set(CPACK_GENERATOR DEB CACHE TEXT "Binary package generator, eg DEB, RPM, TGZ, NSIS...")
@@ -52,12 +51,12 @@
 ## Compiler setup
 include_directories(SYSTEM ${GLIB_INCLUDE_DIRS} 
                     ${GMODULE_INCLUDE_DIRS} 
-                    ${LM_INCLUDE_DIRS}) 
+                    ${LM_INCLUDE_DIRS}
+                    ${MCABBER_INCLUDE_DIR})
 target_link_libraries(marking ${GLIB_LIBRARIES} 
                       ${GMODULE_LIBRARIES}) 
 include_directories(${marking_SOURCE_DIR} 
-                    ${marking_BINARY_DIR} 
-                    ${MCABBER_INCLUDE_DIR}) 
+                    ${marking_BINARY_DIR})
 
 ## Installation
 install(TARGETS marking DESTINATION lib/mcabber) 

--- a/marking.c	Thu Nov 12 12:46:56 2009 +0200
+++ b/marking.c	Fri Jan 15 11:17:42 2010 +0200
@@ -24,12 +24,12 @@
 #include <gmodule.h>
 #include <string.h>
 
-#include "hbuf.h"
-#include "screen.h"
-#include "commands.h"
-#include "compl.h"
-#include "utils.h"
-#include "logprint.h"
+#include <mcabber/hbuf.h>
+#include <mcabber/screen.h>
+#include <mcabber/commands.h>
+#include <mcabber/compl.h>
+#include <mcabber/utils.h>
+#include <mcabber/logprint.h>
 
 static GSList *marked_jids = NULL;