diff options
| author | Alessio Treglia <alessio@debian.org> | 2011-08-27 10:54:22 +0200 |
|---|---|---|
| committer | Alessio Treglia <alessio@debian.org> | 2011-08-27 10:54:22 +0200 |
| commit | 575d802c4f1a81ebce3b7b71be6dd3a51fddf7bd (patch) | |
| tree | f67206af06039627d241d77bc83009505189b7eb /data/Makefile.am | |
| parent | 77a9b5bea4c6dc6977e51b002d92d268e57208f3 (diff) | |
| parent | 87ebc2af1f0417b3bc38a233e28ff673eff4fa51 (diff) | |
Merge commit 'upstream/3.1.5'
Diffstat (limited to 'data/Makefile.am')
| -rw-r--r-- | data/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index d406905..c99f807 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -8,16 +8,16 @@ utilities_in_files = simple-scan.desktop.in utilities_DATA = $(utilities_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = simple-scan.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -@INTLTOOL_SCHEMAS_RULE@ +gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml +@INTLTOOL_XML_NOMERGE_RULE@ +@GSETTINGS_RULES@ man1_MANS = simple-scan.1 -EXTRA_DIST = $(ui_DATA) $(utilities_in_files) $(schema_in_files) $(man1_MANS) +EXTRA_DIST = $(ui_DATA) $(utilities_in_files) org.gnome.SimpleScan.gschema.xml.in $(man1_MANS) DISTCLEANFILES = \ Makefile.in \ $(schema_DATA) \ - $(utilities_DATA) + $(utilities_DATA) \ + $(gsettings_SCHEMAS) |