From 9e22f32c07db0b3b2d72fb252872c9f7bc7141e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Berke=20Kocao=C4=9Flu?= Date: Wed, 22 Sep 2021 21:36:55 +0300 Subject: [PATCH] Change location of example scripts (#86) * Use DOCPREFIX similar to MANPREFIX Co-authored-by: NRK --- Makefile | 7 ++++--- README.md | 4 ++++ {exec => examples}/image-info | 0 {exec => examples}/key-handler | 0 nsxiv.1 | 4 ++-- 5 files changed, 10 insertions(+), 5 deletions(-) rename {exec => examples}/image-info (100%) rename {exec => examples}/key-handler (100%) diff --git a/Makefile b/Makefile index 7464323..68068e1 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ VERSION = 27.1 # PREFIX for install PREFIX ?= /usr/local MANPREFIX = $(PREFIX)/share/man +DOCPREFIX = $(PREFIX)/share/doc/nsxiv # autoreload backend: inotify/nop AUTORELOAD = inotify @@ -82,11 +83,11 @@ install: all install -Dt $(DESTDIR)$(PREFIX)/bin nsxiv @echo "INSTALL nsxiv.1" mkdir -p $(DESTDIR)$(MANPREFIX)/man1 - sed "s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" nsxiv.1 \ + sed "s!DOCPREFIX!$(DOCPREFIX)!g; s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" nsxiv.1 \ >$(DESTDIR)$(MANPREFIX)/man1/nsxiv.1 chmod 644 $(DESTDIR)$(MANPREFIX)/man1/nsxiv.1 @echo "INSTALL share/nsxiv/" - install -Dt $(DESTDIR)$(PREFIX)/share/nsxiv/exec exec/* + install -Dt $(DESTDIR)$(DOCPREFIX)/examples examples/* uninstall: @echo "REMOVE bin/nsxiv" @@ -94,5 +95,5 @@ uninstall: @echo "REMOVE nsxiv.1" rm -f $(DESTDIR)$(MANPREFIX)/man1/nsxiv.1 @echo "REMOVE share/nsxiv/" - rm -rf $(DESTDIR)$(PREFIX)/share/nsxiv + rm -rf $(DESTDIR)$(DOCPREFIX) diff --git a/README.md b/README.md index 2799bf1..69e4632 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,10 @@ You can install nsxiv into a directory of your choice by changing this command t $ make PREFIX="/your/dir" install +Example scripts are installed using `DOCPREFIX` which defaults to +`/usr/local/share/doc/nsxiv`. You can change `DOCPREFIX` the same way you can +change `PREFIX` shown above. + The build-time specific settings of nsxiv can be found in the file *config.h*. Please check and change them, so that they fit your needs. If the file *config.h* does not already exist, then you have to create it with diff --git a/exec/image-info b/examples/image-info similarity index 100% rename from exec/image-info rename to examples/image-info diff --git a/exec/key-handler b/examples/key-handler similarity index 100% rename from exec/key-handler rename to examples/key-handler diff --git a/nsxiv.1 b/nsxiv.1 index 98b10a4..2a08c7f 100644 --- a/nsxiv.1 +++ b/nsxiv.1 @@ -428,7 +428,7 @@ and the arguments given to it are: 1) path to image file, 2) image width, 3) image height. .P There is also an example script installed together with nsxiv as -.IR PREFIX/share/nsxiv/exec/image-info . +.IR DOCPREFIX/examples/image-info . .SH EXTERNAL KEY HANDLER Additional external keyboard commands can be defined using a handler program located in @@ -446,7 +446,7 @@ where C/M/S indicate Ctrl/Meta(Alt)/Shift modifier states and KEY is the X keysym as listed in /usr/include/X11/keysymdef.h without the "XK_" prefix. There is also an example script installed together with nsxiv as -.IR PREFIX/share/nsxiv/exec/key-handler . +.IR DOCPREFIX/examples/key-handler . .SH THUMBNAIL CACHING nsxiv stores all thumbnails under .IR $XDG_CACHE_HOME/nsxiv/ .