[libpeas] Force the Glade catalog to install in libpeas' prefix.
- From: Steve FrÃcinaux <sfre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libpeas] Force the Glade catalog to install in libpeas' prefix.
- Date: Tue, 30 Aug 2011 20:46:35 +0000 (UTC)
commit ad0e1d63fd22d5955c7c3730c0e51dd427f60c82
Author: Steve FrÃcinaux <code istique net>
Date: Tue Aug 30 22:45:04 2011 +0200
Force the Glade catalog to install in libpeas' prefix.
We should never try to install stuff outside of the prefix we were
assigned, due to permission errors, etc.
https://bugzilla.gnome.org/show_bug.cgi?id=654106
configure.ac | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fd344aa..a38c1a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,7 +209,8 @@ AC_MSG_RESULT([$found_glade_catalog])
if test "x$found_glade_catalog" = "xyes"; then
AC_MSG_CHECKING([for Glade catalog dir])
- GLADE_CATALOG_DIR=`$PKG_CONFIG --variable=catalogdir gladeui-2.0 2>&AS_MESSAGE_LOG_FD`
+ GLADE_DATA_DIR=`$PKG_CONFIG --variable=datadir gladeui-2.0 2>&AS_MESSAGE_LOG_FD`
+ GLADE_CATALOG_DIR=`$PKG_CONFIG --variable=catalogdir gladeui-2.0 2>&AS_MESSAGE_LOG_FD | sed -e "s#^$GLADE_DATA_DIR#$datadir#"`
AC_MSG_RESULT([$GLADE_CATALOG_DIR])
AC_SUBST(GLADE_CATALOG_DIR)
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]