diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2016-08-20 08:40:31 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2016-08-20 08:40:31 +0200 |
| commit | 34551ca38e1edbd027589a78f86e379d4932a8d8 (patch) | |
| tree | aa77135296c74ee6d11906cd03dcb4daf976c0dc | |
| parent | 021dac447b2b1335b619fb3420638ae6e2e59a27 (diff) | |
| parent | 2ae5be1ed58d9aea1502a7a90626e87fa1ac560d (diff) | |
Merge branch 'codehearts-freedesktop-icon'
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | config.mk | 4 | ||||
| -rw-r--r-- | share/applications/feh.pre | 2 |
3 files changed, 17 insertions, 2 deletions
@@ -23,7 +23,7 @@ test-x11: all prove test/feh-bg-i.t install: install-man install-doc install-bin install-font install-img -install: install-examples install-applications +install: install-icon install-examples install-applications ifeq (${cam},1) install: install-cam @@ -73,6 +73,17 @@ install-img: @cp share/images/* ${image_dir} @chmod 644 ${image_dir}/* +install-icon: + @echo installing icon to ${48_icon_dir} + @mkdir -p ${48_icon_dir} + @cp share/images/feh.png ${48_icon_dir} + @echo installing icon to ${scalable_icon_dir} + @mkdir -p ${scalable_icon_dir} + @cp share/images/feh.svg ${scalable_icon_dir} + @if which gtk-update-icon-cache > /dev/null 2>&1; then \ + gtk-update-icon-cache ${icon_dir}; \ + fi + install-examples: @echo installing examples to ${example_dir} @mkdir -p ${example_dir} @@ -3,6 +3,7 @@ VERSION ?= ${shell git describe --dirty} # Prefix for all installed files PREFIX ?= /usr/local +ICON_PREFIX ?= /usr/share/icons # Directories for manuals, executables, docs, data, etc. main_dir = ${DESTDIR}${PREFIX} @@ -13,6 +14,9 @@ image_dir = ${main_dir}/share/feh/images font_dir = ${main_dir}/share/feh/fonts example_dir = ${main_dir}/share/doc/feh/examples desktop_dir = ${main_dir}/share/applications +icon_dir = ${ICON_PREFIX}/hicolor +48_icon_dir = ${icon_dir}/48x48/apps +scalable_icon_dir = ${icon_dir}/scalable/apps # default CFLAGS CFLAGS ?= -g -O2 diff --git a/share/applications/feh.pre b/share/applications/feh.pre index 90692de..122f011 100644 --- a/share/applications/feh.pre +++ b/share/applications/feh.pre @@ -7,7 +7,7 @@ Comment=Fast Imlib2-based Image Viewer Exec=feh %F Terminal=false Type=Application -Icon=$IMAGEDIR$/feh.png +Icon=feh Categories=Graphics;2DGraphics;Viewer; MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-tga;image/x-xbitmap; NoDisplay=true |