From 070ec91566ba72209450054735eed0ba301809de Mon Sep 17 00:00:00 2001
From: Federico Hernandez <f@ederi.co>
Date: Wed, 14 Sep 2011 01:10:52 +0200
Subject: [PATCH] Fixed bugs #533 and #536

- correct paths are now written to default .taskrc
---
 ChangeLog      |  2 ++
 cmake.h.in     | 10 +++++++---
 src/Config.cpp | 20 ++++++++++----------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 677fac0f2..16e2d2fec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -107,6 +107,8 @@
  + Fixed bug #511, which caused display problem on Cygwin when colored output
    used the full width of the terminal.  The 'avoidlastcolumn' configuration
    variable forces taskwarrior to never use the last column.
+ + Fixed bugs #533 and #536, which prevented having correct paths for themes
+   in .taskrc (thanks to Juergen Daubert)
  + Fixed bug #594, which broke the 'all' report with a combination of bad regex
    handling and a formatting bug (thanks to Steve Rader).
  + Fixed bug #605, which gave misleading project completion percentages under
diff --git a/cmake.h.in b/cmake.h.in
index 61a878bca..cb5088433 100644
--- a/cmake.h.in
+++ b/cmake.h.in
@@ -1,15 +1,19 @@
-/* cmake.h.in. Creates auto.h during a cmake run */
+/* cmake.h.in. Creates cmake.h during a cmake run */
+
 #define L10N                                           // Localization complete.
 
 /* Package information */
-#define PACKAGE "${PACKAGE}"
-#define VERSION "${VERSION}"
+#define PACKAGE           "${PACKAGE}"
+#define VERSION           "${VERSION}"
 #define PACKAGE_BUGREPORT "${PACKAGE_BUGREPORT}"
 #define PACKAGE_NAME      "${PACKAGE_NAME}"
 #define PACKAGE_TARNAME   "${PACKAGE_TARNAME}"
 #define PACKAGE_VERSION   "${PACKAGE_VERSION}"
 #define PACKAGE_STRING    "${PACKAGE_STRING}"
 
+/* Installation details */
+#define TASK_RCDIR "${CMAKE_INSTALL_PREFIX}/${TASK_DOCDIR}/rc"
+
 /* Localization */
 #define PACKAGE_LANGUAGE  1
 #define LANGUAGE_EN_US 1
diff --git a/src/Config.cpp b/src/Config.cpp
index 3102b6e10..fbb4955df 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -583,16 +583,16 @@ void Config::createDefaultRC (const std::string& rc, const std::string& data)
            << _defaults.substr (0, loc + 14)
            << data
            << "\n\n# Color theme (uncomment one to use)\n"
-           << "#include /usr/local/share/doc/task/rc/light-16.theme\n"
-           << "#include /usr/local/share/doc/task/rc/light-256.theme\n"
-           << "#include /usr/local/share/doc/task/rc/dark-16.theme\n"
-           << "#include /usr/local/share/doc/task/rc/dark-256.theme\n"
-           << "#include /usr/local/share/doc/task/rc/dark-red-256.theme\n"
-           << "#include /usr/local/share/doc/task/rc/dark-green-256.theme\n"
-           << "#include /usr/local/share/doc/task/rc/dark-blue-256.theme\n"
-           << "#include /usr/local/share/doc/task/rc/dark-violets-256.theme\n"
-           << "#include /usr/local/share/doc/task/rc/dark-yellow-green.theme\n"
-           << "#include /usr/local/share/doc/task/rc/dark-gray-256.theme\n"
+           << "#include " << TASK_RCDIR << "/light-16.theme\n"
+           << "#include " << TASK_RCDIR << "/light-256.theme\n"
+           << "#include " << TASK_RCDIR << "/dark-16.theme\n"
+           << "#include " << TASK_RCDIR << "/dark-256.theme\n"
+           << "#include " << TASK_RCDIR << "/dark-red-256.theme\n"
+           << "#include " << TASK_RCDIR << "/dark-green-256.theme\n"
+           << "#include " << TASK_RCDIR << "/dark-blue-256.theme\n"
+           << "#include " << TASK_RCDIR << "/dark-violets-256.theme\n"
+           << "#include " << TASK_RCDIR << "/dark-yellow-green.theme\n"
+           << "#include " << TASK_RCDIR << "/dark-gray-256.theme\n"
            << "\n";
 
   // Write out the new file.