summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile29
1 files changed, 7 insertions, 22 deletions
diff --git a/Makefile b/Makefile
index 3540679..1e7e4e5 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ build-applications:
@${MAKE} -C share/applications
test: all
- @if ! uname -m | fgrep -q -e arm -e mips; then \
+ @if ! uname -m | grep -q -e arm -e mips; then \
PACKAGE=${PACKAGE} prove test/feh.t test/mandoc.t; \
else \
PACKAGE=${PACKAGE} prove test/feh.t test/mandoc.t || cat test/imlib2-bug-notice; \
@@ -25,37 +25,20 @@ test-x11: all
install: install-man install-doc install-bin install-font install-img
install: install-icon 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:
+install-man: man/feh.1
@echo installing manuals to ${man_dir}
@mkdir -p ${man_dir}/man1
@cp man/feh.1 ${man_dir}/man1
@chmod 644 ${man_dir}/man1/feh.1
-install-doc:
+install-doc: AUTHORS ChangeLog README.md TODO
@echo installing docs to ${doc_dir}
@mkdir -p ${doc_dir}
@cp AUTHORS ChangeLog README.md TODO ${doc_dir}
@chmod 644 ${doc_dir}/AUTHORS ${doc_dir}/ChangeLog ${doc_dir}/README.md \
${doc_dir}/TODO
-install-bin:
+install-bin: src/feh
@echo installing executables to ${bin_dir}
@mkdir -p ${bin_dir}
@cp src/feh ${bin_dir}/feh.tmp
@@ -65,12 +48,14 @@ install-bin:
install-font:
@echo installing fonts to ${font_dir}
@mkdir -p ${font_dir}
+ @chmod 755 ${font_dir}
@cp share/fonts/* ${font_dir}
@chmod 644 ${font_dir}/*
install-img:
@echo installing images to ${image_dir}
@mkdir -p ${image_dir}
+ @chmod 755 ${image_dir}
@cp share/images/* ${image_dir}
@chmod 644 ${image_dir}/*
@@ -93,7 +78,7 @@ install-examples:
@cp examples/* ${example_dir}
@chmod 644 ${example_dir}/*
-install-applications:
+install-applications: share/applications/feh.desktop
@echo installing desktop file to ${desktop_dir}
@mkdir -p ${desktop_dir}
@cp share/applications/feh.desktop ${desktop_dir}