aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-03-11 10:45:48 -0400
committerB Stack <bgstack15@gmail.com>2020-03-11 10:45:48 -0400
commit21a2eee53ad514061b2c8d5d21ec69fec219784d (patch)
treeae6bc46355eac7d3581aacf0f69bf421d680b857 /src/Makefile
parentadd usage of sudo (diff)
downloadlogout-manager-21a2eee53ad514061b2c8d5d21ec69fec219784d.tar.gz
logout-manager-21a2eee53ad514061b2c8d5d21ec69fec219784d.tar.bz2
logout-manager-21a2eee53ad514061b2c8d5d21ec69fec219784d.zip
add initial debuild stuff
move bash completion to recommended one from lint improve make deplist with SEPARATOR
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile
index fa385cb..1ef600d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -30,7 +30,7 @@ LIBEXECDIR = $(DESTDIR)$(prefix)/libexec
DOCDIR = $(SHAREDIR)/doc/$(APPNAME)
APPDIR = $(SHAREDIR)/$(APPNAME)
APPSDIR = $(SHAREDIR)/applications
-BASHCDIR = $(SYSCONFDIR)/bash_completion.d
+BASHCDIR = $(SHAREDIR)/bash-completion/completions
SUDOERSDIR = $(SYSCONFDIR)/sudoers.d
awkbin :=$(shell which awk)
@@ -57,7 +57,7 @@ list:
deplist:
@if test -z "$(DISTRO)" ; then ${echobin} "Please run \`make deplist\` with DISTRO= one of: `make deplist_opts 2>&1 1>/dev/null | ${xargsbin}`. Aborted." ; exit 1 ; fi
- @${grepbin} -h --exclude='Makefile' --exclude-dir='doc' -A5 -riIE dependencies $(SRCDIR) | ${awkbin} -v 'distro=$(DISTRO)' 'tolower($$0) ~ distro {$$1="";$$2="";print}' | awk 'BEGIN{cmd="${xargsbin} -n1"} $$0 !~ /\(/{print $$0 | cmd ; close(cmd);} $$0 ~ /\(/{print;}' | ${sortbin} | ${uniqbin} | ${xargsbin}
+ @${grepbin} -h --exclude='Makefile' --exclude-dir='doc' -A5 -riIE dependencies $(SRCDIR) | ${awkbin} -v 'distro=$(DISTRO)' 'tolower($$0) ~ distro {$$1="";$$2="";print}' | awk 'BEGIN{cmd="${xargsbin} -n1"} $$0 !~ /\(/{print $$0 | cmd ; close(cmd);} $$0 ~ /\(/{print;}' | ${sortbin} | ${uniqbin} | ${sedbin} -r -e 's/$$/$(SEPARATOR)/' | ${xargsbin}
deplist_opts:
@${echobin} "el7" 1>&2
@@ -67,12 +67,12 @@ install:
@${echobin} Installing files to ${DESTDIR}
${installbin} -d ${SYSCONFDIR} ${DEFAULTDIR} ${BINDIR} ${APPSDIR} ${APPDIR} ${DOCDIR} ${BASHCDIR} ${SUDOERSDIR}
${cpbin} -pr ${SRCDIR}/etc/*.* ${SYSCONFDIR}
- ${cpbin} -pr ${SRCDIR}/etc/bash_completion.d/* ${BASHCDIR}
${cpbin} -pr ${SRCDIR}/etc/sysconfig/* ${DEFAULTDIR}
${cpbin} -pr ${SRCDIR}/usr/bin/* ${BINDIR}
${cpbin} -pr ${SRCDIR}/usr/share/applications/* ${APPSDIR}
${cpbin} -pr ${SRCDIR}/usr/share/${APPNAME}/*.* ${APPDIR}
${cpbin} -pr ${SRCDIR}/usr/share/doc/${APPNAME}/* ${DOCDIR}
+ ${installbin} -m 0644 -t ${BASHCDIR} ${SRCDIR}/usr/share/bash-completion/completions/*
${installbin} -m 0640 -t ${SUDOERSDIR} ${SRCDIR}/etc/sudoers.d/*
# symlink, when alternatives is not being used
${lnbin} -s logout-manager-gtk.py ${BINDIR}/logout-manager
bgstack15