cmake: rather use SHAREDIR than DATADIR define.

DATADIR is a reserved structure name in win32, using it like us here
leads to very nifty compile problems. SHAREDIR is clean.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eed4fd5608ae0e87fecf1df1a079b677daf0564f..5226ef77518876abb7c19130fcde5bb78de0fb6d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,6 +74,10 @@ message(STATUS "GIT_SHA1 ${GIT_SHA1}")
 
 set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
 set(DATADIR ${DATA_INSTALL_DIR})
+if(WIN32)
+set(DATADIR "share")
+endif(WIN32)
+set(SHAREDIR ${DATADIR})
 
 #####
 ## handle BUILD_OWNCLOUD_OSX_BUNDLE

diff --git a/config.h.in b/config.h.in
index a3e04ed7596e18b47cffe5fc11e7520f64b5332d..4633c16c47827e169c2d5bebabba4507bfc5ef6e 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -21,7 +21,7 @@
 #cmakedefine ZLIB_FOUND @ZLIB_FOUND@
 
 #cmakedefine SYSCONFDIR "@SYSCONFDIR@"
-#cmakedefine DATADIR "@DATADIR@"
+#cmakedefine SHAREDIR "@SHAREDIR@"
 
 #ifndef NEON_WITH_LFS
 #cmakedefine NEON_WITH_LFS "@NEON_WITH_LFS@"

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index ae3b1fd6b6038cf3ff7027749f38604b506f4585..34eb533b6d6f28bd056f53c4034563700d2ddf32 100644 (file)
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -76,7 +76,7 @@ QString applicationTrPath()
 #elif defined(Q_OS_MAC)
     return QApplication::applicationDirPath()+QLatin1String("/../Resources/Translations"); // path defaults to app dir.
 #elif defined(Q_OS_UNIX)
-    return QString::fromLatin1(DATADIR "/" APPLICATION_EXECUTABLE "/i18n/");
+    return QString::fromLatin1(SHAREDIR "/" APPLICATION_EXECUTABLE "/i18n/");
 #endif
 }
 }