From e8b86e2b66a451c6fd232f59ca6660e838afd6c0 Mon Sep 17 00:00:00 2001
From: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Date: Thu, 07 Sep 2006 15:21:26 +0000
Subject: Install icons with correct names. Fixes bug #354429.

2006-09-07  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>

	* configure.ac:
	* data/Makefile.am:
	* data/evince-16.png:
	* data/evince-22.png:
	* data/evince.png:
	* data/evince.svg:
	* data/icons/16x16/Makefile.am:
	* data/icons/16x16/evince.png:
	* data/icons/22x22/Makefile.am:
	* data/icons/22x22/evince.png:
	* data/icons/48x48/Makefile.am:
	* data/icons/48x48/evince.png:
	* data/icons/Makefile.am:
	* data/icons/scalable/Makefile.am:
	* data/icons/scalable/evince.svg:

	Install icons with correct names. Fixes
	bug #354429.
---
(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 35bb0a1..81322cc 100644
--- 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 =				\
@@ -26,14 +28,6 @@ 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-hook:
@@ -57,10 +51,6 @@ EXTRA_DIST =				\
 	$(ui_DATA)			\
 	$(DESKTOP_IN_FILES)		\
 	$(schema_in_files)		\
-	$(icon_16_DATA)			\
-	$(icon_22_DATA)			\
-	$(icon_DATA)			\
-	$(svgicon_DATA)			\
 	$(NULL)				
 
 DISTCLEANFILES = \
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
new file mode 100644
index 0000000..eda65ba
--- /dev/null
+++ b/data/icons/16x16/Makefile.am
@@ -0,0 +1,4 @@
+icondir = $(datadir)/icons/hicolor/16x16/apps
+icon_DATA = evince.png
+
+EXTRA_DIST = $(icon_DATA)
diff --git a/data/evince-16.png b/data/icons/16x16/evince.png
index e2e7fae..e2e7fae 100644
--- a/data/evince-16.png
+++ b/data/icons/16x16/evince.png
Binary files differ
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
new file mode 100644
index 0000000..78fbd7e
--- /dev/null
+++ b/data/icons/22x22/Makefile.am
@@ -0,0 +1,4 @@
+icondir = $(datadir)/icons/hicolor/22x22/apps
+icon_DATA = evince.png
+
+EXTRA_DIST = $(icon_DATA)
diff --git a/data/evince-22.png b/data/icons/22x22/evince.png
index e8b8c12..e8b8c12 100644
--- a/data/evince-22.png
+++ b/data/icons/22x22/evince.png
Binary files differ
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
new file mode 100644
index 0000000..2b07ee6
--- /dev/null
+++ b/data/icons/48x48/Makefile.am
@@ -0,0 +1,4 @@
+icondir = $(datadir)/icons/hicolor/48x48/apps
+icon_DATA = evince.png
+
+EXTRA_DIST = $(icon_DATA)
diff --git a/data/evince.png b/data/icons/48x48/evince.png
index f0b382f..f0b382f 100644
--- a/data/evince.png
+++ b/data/icons/48x48/evince.png
Binary files differ
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
new file mode 100644
index 0000000..8b264bb
--- /dev/null
+++ b/data/icons/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = 16x16 22x22 48x48 scalable
+
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
new file mode 100644
index 0000000..d7bec5d
--- /dev/null
+++ b/data/icons/scalable/Makefile.am
@@ -0,0 +1,4 @@
+icondir = $(datadir)/icons/hicolor/scalable/apps
+icon_DATA = evince.svg
+
+EXTRA_DIST = $(icon_DATA)
diff --git a/data/evince.svg b/data/icons/scalable/evince.svg
index 9b0332f..9b0332f 100644
--- a/data/evince.svg
+++ b/data/icons/scalable/evince.svg
--
cgit v0.9.1