From: verbalshadow <verbalshadow@users.sourceforge.net>
Date: Tue, 1 Apr 2008 00:17:04 +0000 (+0000)
Subject: Cmake: Random fixes
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dde66d7d04aa31ebbbb467e1bfa62b0205569b0f;p=inkscape.git

Cmake: Random fixes
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0df1c0e69..7714f4948 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,8 +12,7 @@ SET(CMAKE_SKIP_RPATH:BOOL OFF)
 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)
 INCLUDE(ConfigCompileFlags)
 INCLUDE(ConfigInkscapeDepends)
-
-SET(CONFIG_H "${CMAKE_CURRENT_BINARY_DIR}/config.h")
+
 INCLUDE_DIRECTORIES (src/ ${CMAKE_CURRENT_BINARY_DIR} )
 LINK_DIRECTORIES (src/)
 
diff --git a/config.h.cmake b/config.h.cmake
index fe4666ec2..1812864d3 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -200,7 +200,7 @@
 #cmakedefine HAVE_ZLIB_H 1
 
 /* Base data directory -- only path-prefix.h should use it! */
-#cmakedefine INKSCAPE_DATADIR 
+#define INKSCAPE_DATADIR "${CMAKE_INSTALL_PREFIX}/share"
 
 /* Base library directory -- only path-prefix.h should use it! */
 #cmakedefine INKSCAPE_LIBDIR
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 000f26b3d..42d99f9cb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,4 @@
 SET(INKSCAPE_SRC
-${CONFIG_H}
 arc-context.cpp
 attributes.cpp
 axis-manip.cpp