Install icons with correct names. Fixes bug #354429.

[evince.git] / data / Makefile.am

diff --git a/data/Makefile.am b/data/Makefile.am
index 183e455fb19bfe549d0de8f4d2df553999e90d6e..81322cc7eaa2385673144eeacffa25d6b738ff14 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,9 @@
+SUBDIRS = icons
+
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_SCHEMAS_RULE@
 
-NULL =
+NULL=
 
 uidir = $(pkgdatadir)
 ui_DATA =                              \
@@ -13,6 +15,7 @@ ui_DATA =                             \
 gladedir = $(pkgdatadir)
 glade_DATA =                           \
        evince-password.glade           \
+       evince-properties.glade         \
        $(NULL)
 
 DESKTOP_IN_FILES= evince.desktop.in.in
@@ -25,7 +28,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 \
@@ -33,14 +38,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)
+
+