diff options
| author | Nickolay V. Shmyrev <nshmyrev@yandex.ru> | 2006-09-07 15:21:26 (GMT) |
|---|---|---|
| committer | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2006-09-07 15:21:26 (GMT) |
| commit | e8b86e2b66a451c6fd232f59ca6660e838afd6c0 (patch) | |
| tree | 451767487fba9e724428f58bfc273e2c0505bcba /data/Makefile.am | |
| parent | 7a0769c469f53e96b2d9f9be9c16bb6cfabc5668 (diff) | |
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.
Diffstat (limited to 'data/Makefile.am')
| -rw-r--r-- | data/Makefile.am | 16 |
1 files changed, 3 insertions, 13 deletions
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 = \ |