Commit 34551ca3 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Merge branch 'codehearts-freedesktop-icon'

parents 021dac44 2ae5be1e

Makefile

+12 −1
Original line number Diff line number Diff line
@@ -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}

config.mk

+4 −0
Original line number Diff line number Diff line
@@ -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

share/applications/feh.pre

+1 −1
Original line number Diff line number Diff line
@@ -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