X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=data%2FMakefile.am;h=35bb0a12d10ca99b0bd4093e30455c5ed77d9545;hb=630b54e8cd688dc0af01f73ca90169f270823d1d;hp=9eece2b28478ae3c2c5cd68bed34f28ec6b0704f;hpb=b36f3a13160e8747019c40f28df89a9a9c3917ea;p=evince.git

diff --git a/data/Makefile.am b/data/Makefile.am
index 9eece2b2..35bb0a12 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -13,10 +13,11 @@ ui_DATA =				\
 gladedir = $(pkgdatadir)
 glade_DATA = 				\
 	evince-password.glade		\
+	evince-properties.glade		\
 	$(NULL)
 
-DESKTOP_IN_FILES= evince.desktop.in
-DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in=.desktop)
+DESKTOP_IN_FILES= evince.desktop.in.in
+DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop)
 
 desktopdir = $(datadir)/applications
 desktop_DATA = $(DESKTOP_FILES)
@@ -25,7 +26,17 @@ schema_in_files = evince.schemas.in
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
-install-data-local:
+icon_16dir = $(datadir)/icons/hicolor/16x16/apps
+icon_16_DATA = evince-16.png
+icon_22dir = $(datadir)/icons/hicolor/22x22/apps
+icon_22_DATA = evince-22.png
+icondir = $(datadir)/icons/hicolor/48x48/apps
+icon_DATA = evince.png
+svgicondir = $(datadir)/icons/hicolor/scalable/apps
+svgicon_DATA = evince.svg
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
 if GCONF_SCHEMAS_INSTALL
 	if test -z "$(DESTDIR)" ; then \
 	for p in $(schema_DATA) ; do \
@@ -33,14 +44,27 @@ if GCONF_SCHEMAS_INSTALL
 	done \
 	fi
 endif
+	if test -z "$(DESTDIR)"; then \
+	        echo "Updating Gtk icon cache."; \
+	        $(gtk_update_icon_cache); \
+	else \
+	        echo "*** Icon cache not updated.  After install, run this:"; \
+	        echo "***   $(gtk_update_icon_cache)"; \
+	        fi
 
 EXTRA_DIST =				\
 	$(glade_DATA)			\
 	$(ui_DATA)			\
 	$(DESKTOP_IN_FILES)		\
 	$(schema_in_files)		\
-	$(NULL)
+	$(icon_16_DATA)			\
+	$(icon_22_DATA)			\
+	$(icon_DATA)			\
+	$(svgicon_DATA)			\
+	$(NULL)				
 
 DISTCLEANFILES = \
 	$(DESKTOP_FILES)	\
 	$(schema_DATA)
+
+