From bf87db5b38ec651e3509ea5ec02bb4c7928352e3 Mon Sep 17 00:00:00 2001 From: Mike Burns Date: Tue, 23 Jul 2013 19:03:58 +0200 Subject: Rename libexec to share The `/usr/local/libexec` standard looks awkward on Debian, so after careful and sad evaluation we've concluded that we do not, in fact, execute the `rcm.sh` library. Move it to `/usr/local/share` instead. --- Makefile | 8 ++++---- bin/lsrc | 2 +- bin/mkrc | 2 +- bin/rcup | 2 +- libexec/rcm/rcm.sh | 11 ----------- share/rcm/rcm.sh | 11 +++++++++++ 6 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 libexec/rcm/rcm.sh create mode 100644 share/rcm/rcm.sh diff --git a/Makefile b/Makefile index dfefad4..d70e15f 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ install: install -dm 0755 $(PREFIX)/bin install -dm 0755 $(PREFIX)/share/man/man1 install -dm 0755 $(PREFIX)/share/man/man5 - install -dm 0755 $(PREFIX)/libexec/rcm + install -dm 0755 $(PREFIX)/share/rcm install -m 0755 bin/mkrc $(PREFIX)/bin install -m 0755 bin/rcup $(PREFIX)/bin install -m 0755 bin/lsrc $(PREFIX)/bin @@ -12,7 +12,7 @@ install: install -m 0644 man/man1/mkrc.1 $(PREFIX)/share/man/man1 install -m 0644 man/man1/lsrc.1 $(PREFIX)/share/man/man1 install -m 0644 man/man5/rcrc.5 $(PREFIX)/share/man/man5 - install -m 0644 libexec/rcm/rcm.sh $(PREFIX)/libexec/rcm + install -m 0644 share/rcm/rcm.sh $(PREFIX)/share/rcm uninstall: rm -f $(PREFIX)/bin/mkrc @@ -22,7 +22,7 @@ uninstall: rm -f $(PREFIX)/man/man1/mkrc.1 rm -f $(PREFIX)/man/man1/lsrc.1 rm -f $(PREFIX)/man/man5/rcrc.5 - rm -f $(PREFIX)/libexec/rcm/rcm.sh - rmdir $(PREFIX)/libexec/rcm + rm -f $(PREFIX)/share/rcm/rcm.sh + rmdir $(PREFIX)/share/rcm .PHONY: install uninstall diff --git a/bin/lsrc b/bin/lsrc index cdebfeb..972f54f 100755 --- a/bin/lsrc +++ b/bin/lsrc @@ -141,7 +141,7 @@ if [ -e $HOME/.rcrc ]; then . $HOME/.rcrc fi -. `dirname $0`/../libexec/rcm/rcm.sh +. `dirname $0`/../share/rcm/rcm.sh handle_command_line $* if [ "x$DOTFILES_DIRS" = "x" ]; then diff --git a/bin/mkrc b/bin/mkrc index e52c76b..dd1f46e 100755 --- a/bin/mkrc +++ b/bin/mkrc @@ -27,7 +27,7 @@ if [ -e $HOME/.rcrc ]; then . $HOME/.rcrc fi -. `dirname $0`/../libexec/rcm/rcm.sh +. `dirname $0`/../share/rcm/rcm.sh if [ $# -eq 0 ]; then echo "Usage: mkrc [-d dir] [-t tag] [-v] [-q] filename ..." diff --git a/bin/rcup b/bin/rcup index 22f699d..4c3529d 100755 --- a/bin/rcup +++ b/bin/rcup @@ -144,7 +144,7 @@ if [ -e $HOME/.rcrc ]; then . $HOME/.rcrc fi -. `dirname $0`/../libexec/rcm/rcm.sh +. `dirname $0`/../share/rcm/rcm.sh handle_command_line $* for dest_and_src in `lsrc $LS_ARGS`; do diff --git a/libexec/rcm/rcm.sh b/libexec/rcm/rcm.sh deleted file mode 100644 index 54bdb07..0000000 --- a/libexec/rcm/rcm.sh +++ /dev/null @@ -1,11 +0,0 @@ -VERSION="0.0.2" - -version() { - cat << EOV -$1 (rcm) $VERSION -Copyright (C) 2013 Mike Burns -License BSD: BSD 3-clause license - -Written by Mike Burns. -EOV -} diff --git a/share/rcm/rcm.sh b/share/rcm/rcm.sh new file mode 100644 index 0000000..54bdb07 --- /dev/null +++ b/share/rcm/rcm.sh @@ -0,0 +1,11 @@ +VERSION="0.0.2" + +version() { + cat << EOV +$1 (rcm) $VERSION +Copyright (C) 2013 Mike Burns +License BSD: BSD 3-clause license + +Written by Mike Burns. +EOV +} -- cgit v1.2.3