Merge lp:~compiz-team/compiz-libcompizconfig/compiz-libcompizconfig.fix_874842 into lp:compiz-libcompizconfig

[Sam Spilsbury]

Fix bug 874842

[Robert Carr (robertcarr)]

+1

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2010-05-21 02:55:08 +0000
+++ src/CMakeLists.txt	2011-10-15 07:35:26 +0000
@@ -24,6 +24,7 @@
     -DIMAGEDIR=\\\"${COMPIZ_IMAGEDIR}\\\"
     -DMETADATADIR=\\\"${COMPIZ_METADATADIR}\\\"
     -DSYSCONFDIR=\\\"${COMPIZ_SYSCONFDIR}\\\"
+    -DDATADIR=\\\"${COMPIZ_DATADIR}\\\"
     -DLIBDIR=\\\"${COMPIZ_LIBDIR}\\\"
 )
 
 
=== modified file 'src/main.c'
--- src/main.c	2011-09-15 13:12:45 +0000
+++ src/main.c	2011-10-15 07:35:26 +0000
@@ -3427,7 +3427,7 @@
 {
     struct dirent 	   **nameList;
     int 	  	   nFile, i;
-    char	  	   *path = SYSCONFDIR "/compizconfig/upgrades/";
+    char	  	   *path = DATADIR "/compizconfig/upgrades/";
     char		   *dupath = NULL;
     FILE		   *completedUpgrades;
     char		   *cuBuffer;