[libgnomekbd] build: Ensure we install gsettings schemas



commit 8634255b1b2146795395f573f69bd66cc38c67ac
Author: Rui Matos <tiagomatos gmail com>
Date:   Tue Sep 20 18:45:59 2016 +0200

    build: Ensure we install gsettings schemas
    
    Commit a0c98a08 left us with uninstallable schemas.

 configure.ac                                       |    6 +++---
 libgnomekbd/Makefile.am                            |    1 +
 ...> org.gnome.libgnomekbd.desktop.gschema.xml.in} |    0
 ....in.in => org.gnome.libgnomekbd.gschema.xml.in} |    0
 ... org.gnome.libgnomekbd.keyboard.gschema.xml.in} |    0
 po/POTFILES.in                                     |    6 +++---
 6 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 59c08f0..744ccc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,9 +91,9 @@ libgnomekbd.pc
 libgnomekbdui.pc
 po/Makefile.in
 libgnomekbd/Makefile
-libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in
-libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in
-libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in
+libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml
+libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml
+libgnomekbd/org.gnome.libgnomekbd.gschema.xml
 libgnomekbd/gkbd-keyboard-display.desktop.in
 test/Makefile
 ])
diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am
index 3609998..577ed02 100644
--- a/libgnomekbd/Makefile.am
+++ b/libgnomekbd/Makefile.am
@@ -13,6 +13,7 @@ icons_DATA = kbdled-caps-lock.svg \
 gsettings_SCHEMAS = org.gnome.libgnomekbd.desktop.gschema.xml \
                    org.gnome.libgnomekbd.keyboard.gschema.xml \
                    org.gnome.libgnomekbd.gschema.xml
+@GSETTINGS_RULES@
 
 common_CFLAGS = \
        -I$(top_srcdir)                                 \
diff --git a/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in 
b/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in
similarity index 100%
rename from libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in
rename to libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in
diff --git a/libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in.in 
b/libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in
similarity index 100%
rename from libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in.in
rename to libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in
diff --git a/libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in.in 
b/libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in
similarity index 100%
rename from libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in.in
rename to libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 67e496c..f79b367 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,8 +8,8 @@ libgnomekbd/gkbd-keyboard-display.desktop.in.in
 libgnomekbd/gkbd-keyboard-drawing.c
 libgnomekbd/gkbd-status.c
 libgnomekbd/gkbd-util.c
-libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in
-libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in.in
-libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in.in
+libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in
+libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in
+libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in
 libgnomekbd/show-layout.ui
 test/gkbd-indicator-test.c


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