[gtksourceview] Fix glade catalog build rules



commit 57ac6a5596d2a336c9d744b59f34385c4430abeb
Author: Paolo Borelli <pborelli gnome org>
Date:   Sun Aug 16 21:28:26 2015 +0200

    Fix glade catalog build rules

 configure.ac           |    2 +-
 data/glade/Makefile.am |    9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f51e405..e7cde0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,7 +125,7 @@ AM_CONDITIONAL([GLADE_CATALOG], [ test "$glade_catalog" = "yes" ])
 
 AS_IF([ test "$glade_catalog" = "yes" ],
        [PKG_CHECK_MODULES(GLADE, [gladeui-2.0 >= $GLADE_UI_REQUIRED])
-        AC_MSG_CHECKING([for Glade catalog dir])
+        AC_MSG_CHECKING([whether to install Glade catalog])
         GLADE_CATALOG_DIR=`$PKG_CONFIG --variable=catalogdir gladeui-2.0 2>&AS_MESSAGE_LOG_FD`
         AC_MSG_RESULT([$GLADE_CATALOG_DIR])
         AC_SUBST(GLADE_CATALOG_DIR)])
diff --git a/data/glade/Makefile.am b/data/glade/Makefile.am
index 989da7a..c8f4b8a 100644
--- a/data/glade/Makefile.am
+++ b/data/glade/Makefile.am
@@ -1,4 +1,11 @@
-catalogdir = $(GLADE_CATALOG_DIR)
+# Note that we do not install in the detected GLADE_CATALOG_DIR
+# since we may not have permissions to do it, for instance if
+# compiling with a prefix while glade is installed in /usr.
+# We use the variable only to find the dtd file.
+# If you install gtksourceview and glade in different prefixes
+# and want to use the catalog in glade, you will need to set
+# the GLADE_CATALOG_SEARCH_PATH environment variable.
+catalogdir = $(datadir)/glade/catalogs
 catalog_in_files = gtksourceview.xml.in
 catalog_DATA = $(catalog_in_files:.xml.in=.xml)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]