pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

exa: Fixes the location of shell completion files, suggestion by leot@.



Module Name:	pkgsrc-wip
Committed By:	Santhosh Raju <fox%NetBSD.org@localhost>
Pushed By:	fox
Date:		Wed Jul 17 18:45:18 2019 -0500
Changeset:	bf1e761fc3a90b87ad38615a05adc5047416e953

Modified Files:
	exa/Makefile
	exa/PLIST

Log Message:
exa: Fixes the location of shell completion files, suggestion by leot@.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bf1e761fc3a90b87ad38615a05adc5047416e953

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 exa/Makefile | 24 ++++++++++--------------
 exa/PLIST    |  6 +++---
 2 files changed, 13 insertions(+), 17 deletions(-)

diffs:
diff --git a/exa/Makefile b/exa/Makefile
index d7fb244db4..6b883d537c 100644
--- a/exa/Makefile
+++ b/exa/Makefile
@@ -79,27 +79,23 @@ CARGO_CRATE_DEPENDS+=	wincolor-1.0.1
 CARGO_CRATE_DEPENDS+=	zoneinfo_compiled-0.4.8
 
 INSTALLATION_DIRS=	bin \
-			${PKGMANDIR}/man1
-
-EGDIR=			${PREFIX}/share/examples/exa
-
-CONF_FILES+=		${EGDIR}/completions.bash \
-			${PKG_SYSCONFDIR}/bash_completion.d/exa.bash
-CONF_FILES+=		${EGDIR}/completions.fish \
-			${PREFIX}/share/fish/completions/exa.fish
-CONF_FILES+=		${EGDIR}/completions.zsh \
-			${PREFIX}/share/zsh/site-functions/_exa
+			${PKGMANDIR}/man1 \
+			share/bash-completion/completions \
+			share/fish/vendor_completions.d \
+			share/zsh/site-functions
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release
 
 do-install:
-	${MKDIR} ${DESTDIR}${EGDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/target/release/exa ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/contrib/man/exa.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA} ${WRKSRC}/contrib/completions.bash ${DESTDIR}${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/contrib/completions.fish ${DESTDIR}${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/contrib/completions.zsh ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/completions.bash \
+			${DESTDIR}${PREFIX}/share/bash-completion/completions/exa
+	${INSTALL_DATA} ${WRKSRC}/contrib/completions.fish \
+			${DESTDIR}${PREFIX}/share/fish/vendor_completions.d/exa.fish
+	${INSTALL_DATA} ${WRKSRC}/contrib/completions.zsh \
+			${DESTDIR}${PREFIX}/share/zsh/site-functions/_exa
 
 
 .include "../../lang/rust/cargo.mk"
diff --git a/exa/PLIST b/exa/PLIST
index 1fafc68a48..36441b99bd 100644
--- a/exa/PLIST
+++ b/exa/PLIST
@@ -1,6 +1,6 @@
 @comment $NetBSD$
 bin/exa
 man/man1/exa.1
-share/examples/exa/completions.bash
-share/examples/exa/completions.fish
-share/examples/exa/completions.zsh
+share/bash-completion/completions/exa
+share/fish/vendor_completions.d/exa.fish
+share/zsh/site-functions/_exa


Home | Main Index | Thread Index | Old Index