fix csync BINARYDIR and SOURCEDIR

csync/ConfigureChecks.cmake

@@ -12,8 +12,8 @@ set(LIBDIR ${LIB_INSTALL_DIR})
 set(PLUGINDIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}")
 set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
 
-set(BINARYDIR ${CMAKE_BINARY_DIR})
-set(SOURCEDIR ${CMAKE_SOURCE_DIR})
+set(BINARYDIR ${CMAKE_CURRENT_BINARY_DIR})
+set(SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 # HEADER FILES
 check_include_file(argp.h HAVE_ARGP_H)

csync/config_test.h.cmake

@@ -1,7 +1,7 @@
 
 /* mind to have trailing slashes! */
 
-#define TESTFILES_DIR "@SOURCE_DIR@/tests/ownCloud/testfiles/"
+#define TESTFILES_DIR "@SOURCE_DIR@/csync/tests/ownCloud/testfiles/"
 
-#define TEST_CONFIG_DIR "@SOURCE_DIR@/tests/ownCloud/"
+#define TEST_CONFIG_DIR "@SOURCE_DIR@/csync/tests/ownCloud/"
 

csync/src/csync_config.c

@@ -99,11 +99,6 @@ static int _csync_config_copy_default (const char *config) {
 #else
     CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Copy %s/config/%s to %s", SYSCONFDIR,
         CSYNC_CONF_FILE, config);
-# ifdef WITH_UNIT_TESTING
-    rc = c_copy(BINARYDIR "/config/" CSYNC_CONF_FILE, config, 0644);
-# else
-    rc = 0;
-# endif
     if (c_copy(SYSCONFDIR "/ocsync/" CSYNC_CONF_FILE, config, 0644) < 0) {
       if (c_copy(BINARYDIR "/config/" CSYNC_CONF_FILE, config, 0644) < 0) {
         rc = -1;