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=5e05397145716e9cb644482ee57595cd05eb3a5a;hb=592bc46cb8c4d56dd04c39ac87d287a0abcf6fa6;hp=39835b31a4e58d4f2cde2d46c43d859867d25cda;hpb=c9c1e2212e37fb03d5e4ce4192cfe3f8a7515c5c;p=evince.git

diff --git a/data/Makefile.am b/data/Makefile.am
index 39835b31..5e053971 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,12 +1,15 @@
+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)
 
@@ -26,17 +29,9 @@ schema_in_files = evince.schemas.in
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
-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-local:
+install-data-hook:
 if GCONF_SCHEMAS_INSTALL
 	if test -z "$(DESTDIR)" ; then \
 	for p in $(schema_DATA) ; do \
@@ -57,10 +52,6 @@ EXTRA_DIST =				\
 	$(ui_DATA)			\
 	$(DESKTOP_IN_FILES)		\
 	$(schema_in_files)		\
-	$(icon_16_DATA)			\
-	$(icon_22_DATA)			\
-	$(icon_DATA)			\
-	$(svgicon_DATA)			\
 	$(NULL)				
 
 DISTCLEANFILES = \