Download as
Browse Code »

Commit 1988c4452d300b93a88e5aa7488edb865e474089

Authored by Perry Werneck
1 parent 09d6eb3a
Exists in master and in 2 other branches develop, script-support

Fix bug #24 - Run glib-compile-schemas after schema installation.

Showing 2 changed files with 6 additions and 3 deletions   Show diff stats
@@ -147,6 +147,7 @@ AC_PATH_TOOL([APPSTREAMCLI],[appstreamcli], [no]) @@ -147,6 +147,7 @@ AC_PATH_TOOL([APPSTREAMCLI],[appstreamcli], [no])
147 AC_PATH_TOOL([STRIP], [strip], [true]) 147 AC_PATH_TOOL([STRIP], [strip], [true])
148 148
149 AC_PATH_TOOL([DESKTOP_INSTALL],[desktop-file-install],[no]) 149 AC_PATH_TOOL([DESKTOP_INSTALL],[desktop-file-install],[no])
  150 +AC_PATH_TOOL([GLIB_SCHEMA_COMPILER],[glib-compile-schemas],[false])
150 151
151 PKG_CHECK_EXISTS 152 PKG_CHECK_EXISTS
152 153
schemas/Makefile.in
  Diff comments   View file @1988c44
@@ -48,13 +48,14 @@ BINDIR=$(BASEDIR)/.bin @@ -48,13 +48,14 @@ BINDIR=$(BASEDIR)/.bin
48 MKDIR=@MKDIR_P@ 48 MKDIR=@MKDIR_P@
49 INSTALL=@INSTALL@ 49 INSTALL=@INSTALL@
50 INSTALL_DATA=@INSTALL_DATA@ 50 INSTALL_DATA=@INSTALL_DATA@
  51 +GLIB_SCHEMA_COMPILER=@GLIB_SCHEMA_COMPILER@
51 52
52 #---[ Install Targets ]------------------------------------------------------------------ 53 #---[ Install Targets ]------------------------------------------------------------------
53 54
54 all: 55 all:
55 # Compile schemas to check if they're valid 56 # Compile schemas to check if they're valid
56 - @glib-compile-schemas \  
57 - --targetdir=$(BINDIR) \ 57 + @$(GLIB_SCHEMA_COMPILER) \
  58 + --dry-run \
58 $(BASEDIR)/schemas/@OSNAME@ 59 $(BASEDIR)/schemas/@OSNAME@
59 60
60 install: \ 61 install: \
@@ -65,9 +66,10 @@ install: \ @@ -65,9 +66,10 @@ install: \
65 $(BASEDIR)/schemas/@OSNAME@/application.gschema.xml \ 66 $(BASEDIR)/schemas/@OSNAME@/application.gschema.xml \
66 $(DESTDIR)/$(schemadir)/$(PRODUCT_NAME)-application.gschema.xml 67 $(DESTDIR)/$(schemadir)/$(PRODUCT_NAME)-application.gschema.xml
67 68
68 -  
69 @$(INSTALL_DATA) \ 69 @$(INSTALL_DATA) \
70 $(BASEDIR)/schemas/@OSNAME@/window.gschema.xml \ 70 $(BASEDIR)/schemas/@OSNAME@/window.gschema.xml \
71 $(DESTDIR)/$(schemadir)/$(PRODUCT_NAME)-window.gschema.xml 71 $(DESTDIR)/$(schemadir)/$(PRODUCT_NAME)-window.gschema.xml
72 72
  73 + @$(GLIB_SCHEMA_COMPILER) \
  74 + $(DESTDIR)/$(schemadir)
73 75