Commit 48804d10 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

don't install feh-cam and gen-cam-menu by default 

They have been deprecated since 2011 and may be removed entirely in future
versions.
parent 5e8118b2

ChangeLog

+6 −0
Original line number Diff line number Diff line 
git HEAD



    * feh-cam and gen-cam-menu are no longer installed by default. Use

      make install cam=1 to install them or make uninstall cam=1 to remove

      them permanently



Sun, 27 Apr 2014 20:28:02 +0200  Daniel Friesel <derf+feh@finalrewind.org>



* Release v2.11

Makefile

+21 −6
Original line number Diff line number Diff line
@@ -21,12 +21,28 @@ test-x11: all 
install: install-man install-doc install-bin install-font install-img

install: install-examples install-applications



ifeq (${cam},1)

install: install-cam

uninstall: uninstall-cam

endif



install-cam:

	@echo installing fe-cam and gen-cam-menu

	@cp man/feh-cam.1 man/gen-cam-menu.1 ${man_dir}/man1

	@chmod 644 ${man_dir}/man1/feh-cam.1 ${man_dir}/man1/gen-cam-menu.1

	@cp cam/feh-cam cam/gen-cam-menu ${bin_dir}

	@chmod 755 ${bin_dir}/feh-cam ${bin_dir}/gen-cam-menu



uninstall-cam:

	rm -f ${man_dir}/man1/feh-cam.1

	rm -f ${man_dir}/man1/gen-cam-menu.1

	rm -f ${bin_dir}/feh-cam ${bin_dir}/gen-cam-menu



install-man:

	@echo installing manuals to ${man_dir}

	@mkdir -p ${man_dir}/man1

	@cp man/*.1 ${man_dir}/man1

	@chmod 644 ${man_dir}/man1/feh.1 ${man_dir}/man1/feh-cam.1 \

		${man_dir}/man1/gen-cam-menu.1

	@cp man/feh.1 ${man_dir}/man1

	@chmod 644 ${man_dir}/man1/feh.1



install-doc:

	@echo installing docs to ${doc_dir}
@@ -38,9 +54,8 @@ install-doc: 
install-bin:

	@echo installing executables to ${bin_dir}

	@mkdir -p ${bin_dir}

	@cp src/feh cam/feh-cam cam/gen-cam-menu ${bin_dir}

	@chmod 755 ${bin_dir}/feh ${bin_dir}/feh-cam \

		${bin_dir}/gen-cam-menu

	@cp src/feh ${bin_dir}

	@chmod 755 ${bin_dir}/feh



install-font:

	@echo installing fonts to ${font_dir}

README

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ support and get a debug build. 


Available flags are:



 * cam      (default 0) - install deprecated feh-cam und gen-cam-menu scripts

 * curl     (default 1) - use libcurl to view http:// and similar images

 * debug    (default 0) - debug build, enables --debug

 * exif     (default 0) - Builtin EXIF tag display support

config.mk

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ desktop_dir = ${main_dir}/share/applications 
CFLAGS ?= -g -O2

CFLAGS += -Wall -Wextra -pedantic



cam ?= 0

curl ?= 1

debug ?= 0

help ?= 0