diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | CMakeScripts/ConfigPaths.cmake | 2 | ||||
| -rwxr-xr-x | mingwenv.bat | 4 |
4 files changed, 6 insertions, 4 deletions
@@ -172,3 +172,5 @@ Gellule Xg Daniel Yacob David Yip Masatake Yamato +Moritz Eberl +Sebastian Faubel
\ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 74aa54214..489346ca2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -347,7 +347,7 @@ elseif(WIN32) DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) install(DIRECTORY ${DEVLIBS_PATH}/share/locale - DESTINATION ${CMAKE_INSTALL_PREFIX}) + DESTINATION ${CMAKE_INSTALL_PREFIX}/share) install(DIRECTORY ${DEVLIBS_PATH}/etc/gtk-2.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake index 09cd96df0..6ce849206 100644 --- a/CMakeScripts/ConfigPaths.cmake +++ b/CMakeScripts/ConfigPaths.cmake @@ -151,7 +151,7 @@ if(WIN32) endif() # Directory containing the current locale (translations). - set(PACKAGE_LOCALE_DIR "locale") + set(PACKAGE_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale") set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.") else(WIN32) # TODO: check and change this to correct value: diff --git a/mingwenv.bat b/mingwenv.bat index 126f3703c..3765b73b5 100755 --- a/mingwenv.bat +++ b/mingwenv.bat @@ -1,6 +1,6 @@ @echo Setting environment variables for MinGw build of Inkscape -IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs -IF "%MINGW_PATH%"=="" set MINGW_PATH=c:\mingw +IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs64 +IF "%MINGW_PATH%"=="" set MINGW_PATH=c:\mingw64 set MINGW_BIN=%MINGW_PATH%\bin set PKG_CONFIG_PATH=%DEVLIBS_PATH%\lib\pkgconfig set GS_BIN=C:\latex\gs\gs8.61\bin |