[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=f69f9b0

The following commit has been merged in the master branch:
commit f69f9b0827b6b939b2a6edc7f0a3026e48704218
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Mar 10 11:52:46 2011 +0100

    Move the generated config.h to build/ to not confuse others
---
 CMakeLists.txt | 2 +-
 main.cpp       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b746a2f..dbeafa6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ set (CMAKE_MODULE_PATH
 
 OPTION(TP_DEBUG  "Enable Telepathy-Qt4 Debug output" OFF )
 
-CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_SOURCE_DIR}/config.h )
+CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_SOURCE_DIR}/build/config.h )
 
 set(KDE_MIN_VERSION "4.4.75")
 find_package (KDE4 4.4.75 REQUIRED)
diff --git a/main.cpp b/main.cpp
index cc87a4f..140a11b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -25,7 +25,7 @@ extern "C"
 }
 
 #include "main-widget.h"
-#include "config.h"
+#include "build/config.h"
 
 #include <KAboutData>
 #include <KCmdLineArgs>

-- 
ktp-contact-list packaging