[geany/geany] cc6602: autotools: Install to $prefix/data on win32

[Thomas Martitz]

Branch:      refs/heads/master
Author:      Thomas Martitz <kugel at rockbox.org>
Committer:   Thomas Martitz <kugel at rockbox.org>
Date:        Wed, 25 Feb 2015 08:23:12 UTC
Commit:      cc6602c2b6096739c8a3d5dad51b35885e31b895
             https://github.com/geany/geany/commit/cc6602c2b6096739c8a3d5dad51b35885e31b895

Log Message:
-----------
autotools: Install to $prefix/data on win32

setup_paths() sets app->datadir to $prefix/win32. With mingw-via-autotools,
it installed data to $prefix/share/geany (like on Linux). With this change
data is installed to $prefix/data ($datarootdir is not changed).

This fixes geany startup after make install with autotools.

Linux:
pkgdatadir = ${datarootdir}/geany
GEANY_DATA_DIR = /path/to/prefix/share/geany

Win32:
pkgdatadir = ${prefix}/data
GEANY_DATA_DIR = /path/to/prefix/data


Modified Paths:
--------------
    configure.ac

Modified: configure.ac
8 lines changed, 6 insertions(+), 2 deletions(-)
===================================================================
@@ -110,8 +110,12 @@ GEANY_CHECK_THE_FORCE dnl hehe
 # i18n
 GEANY_I18N
 
-GEANY_DATA_DIR=`eval echo ${datarootdir}/geany`
-AC_SUBST([GEANY_DATA_DIR])
+# double eval since datarootdir is usually defined as ${prefix}/share
+AM_COND_IF([MINGW],
+  [pkgdatadir='${prefix}/data'],
+  [pkgdatadir='${datarootdir}/geany'])
+AC_SUBST([GEANY_DATA_DIR], [$(eval echo $(eval echo $pkgdatadir))])
+AC_SUBST([pkgdatadir])
 
 # Documentation tools
 GEANY_CHECK_DOCUTILS



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).