X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=data%2FMakefile.am;h=5e05397145716e9cb644482ee57595cd05eb3a5a;hb=592bc46cb8c4d56dd04c39ac87d287a0abcf6fa6;hp=0b1bd18fe34851bb8c868c271bb70a47822e4e94;hpb=c65f029b1669d2aae4417169d6b0c25969521d47;p=evince.git

diff --git a/data/Makefile.am b/data/Makefile.am
index 0b1bd18f..5e053971 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,20 +1,26 @@
+SUBDIRS = icons
+
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_SCHEMAS_RULE@
 
-NULL =
+NULL=
 
 uidir = $(pkgdatadir)
 ui_DATA =				\
 	evince-ui.xml			\
+	evince-toolbar.xml		\
+	evince-preview-toolbar.xml		\
+	hand-open.png			\
 	$(NULL)
 
 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)
@@ -23,7 +29,9 @@ schema_in_files = evince.schemas.in
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
-install-data-local:
+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 \
@@ -31,14 +39,23 @@ 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)
+	$(NULL)				
 
 DISTCLEANFILES = \
 	$(DESKTOP_FILES)	\
 	$(schema_DATA)
+
+