Fixes for make dist and make distcheck

10 files changed, 26 insertions, 5 deletions

diff --git a/configure.ac b/configure.ac
index dab65c7..aa1cc42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
-AC_INIT([mate-session], [1.6.0], [http://www.mate-desktop.org/])
+AC_INIT([mate-session-manager], [1.6.0], [http://www.mate-desktop.org/])
 AC_CONFIG_SRCDIR([mate-session])
 AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2])
+AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 266f110..01b9bb1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -36,7 +36,7 @@ convert_DATA = mate-session.convert
 EXTRA_DIST =					\
 	mate-wm				\
 	$(xsession_in_files)			\
-	$(gsettings_SCHEMAS)			\
+	$(gsettings_SCHEMAS).in.in		\
 	$(convert_DATA)				\
 	$(ui_DATA)				\
 	$(pixmap_DATA_dist)
@@ -44,6 +44,8 @@ EXTRA_DIST =					\
 CLEANFILES =					\
 	$(xsession_DATA)			\
 	$(desktop_DATA)				\
+	$(gsettings_SCHEMAS).in		\
+	$(gsettings_SCHEMAS)		\
 	mate-wm.desktop
 
 DISTCLEANFILES =				\
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index cb68d6b..f0d7ed6 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -16,6 +16,9 @@ install-data-hook:
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+uninstall-hook:
+	@rm -f $(datadir)/icons/hicolor/icon-theme.cache
+
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(icons_SOURCE)
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index 7d31351..7838b1d 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -16,6 +16,9 @@ install-data-hook:
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+uninstall-hook:
+	@rm -f $(datadir)/icons/hicolor/icon-theme.cache
+
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(icons_SOURCE)
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index e4fdf11..29d2692 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -15,6 +15,9 @@ install-data-hook:
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+uninstall-hook:
+	@rm -f $(datadir)/icons/hicolor/icon-theme.cache
+
 EXTRA_DIST =		\
 	$(icons_DATA)
 
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index 584ee65..ecac65c 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -16,6 +16,9 @@ install-data-hook:
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+uninstall-hook:
+	@rm -f $(datadir)/icons/hicolor/icon-theme.cache
+
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(icons_SOURCE)
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 36cffbd..90d5571 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -15,6 +15,9 @@ install-data-hook:
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+uninstall-hook:
+	@rm -f $(datadir)/icons/hicolor/icon-theme.cache
+
 EXTRA_DIST =		\
 	$(icons_DATA)
 
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index eaaae93..a097468 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -15,6 +15,9 @@ install-data-hook:
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+uninstall-hook:
+	@rm -f $(datadir)/icons/hicolor/icon-theme.cache
+
 EXTRA_DIST =		\
 	$(icons_DATA)
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4e43b47..928b5e1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,8 +4,8 @@ capplet/gsm-app-dialog.c
 capplet/gsm-properties-dialog.c
 capplet/gsp-app.c
 capplet/main.c
+data/org.mate.session.gschema.xml.in.in
 data/mate.desktop.in
-data/mate-session.schemas.in.in
 data/mate-wm.desktop.in.in
 [type: gettext/glade]data/gsm-inhibit-dialog.ui
 data/mate-session-properties.desktop.in.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e1a9071..17705b5 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,7 @@
 # List of source files containing translatable strings that should not be
 # translated.
 # Please keep this file sorted alphabetically.
+data/org.mate.session.gschema.xml.in
+data/mate-session-properties.desktop.in
 data/mate-session.schemas.in
 data/mate-wm.desktop.in
-data/session-properties.desktop.in