[geany/geany] 969433: Merge pull request #428 from kugel-/mingw-datadir
Colomban Wendling
git-noreply at xxxxx
Tue Mar 3 16:05:44 UTC 2015
Branch: refs/heads/master
Author: Colomban Wendling <ban at herbesfolles.org>
Committer: Colomban Wendling <ban at herbesfolles.org>
Date: Tue, 03 Mar 2015 16:05:44 UTC
Commit: 9694338e71bdfabd0700980252dbde7095606f57
https://github.com/geany/geany/commit/9694338e71bdfabd0700980252dbde7095606f57
Log Message:
-----------
Merge pull request #428 from kugel-/mingw-datadir
Fix installation of data files on Windows with the Autotools build
system.
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).
More information about the Commits
mailing list