pkgsrc-WIP-changes archive

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

pacman: fixed installation of conf files.



Module Name:	pkgsrc-wip
Committed By:	Aleksej Lebedev <root%zta.lk@localhost>
Pushed By:	zhtw
Date:		Mon Sep 3 15:07:18 2018 +0200
Changeset:	4766fdd309aafb1f3ac1bf3a4cece2b1b1d8240c

Modified Files:
	pacman/Makefile
	pacman/PLIST

Log Message:
pacman: fixed installation of conf files.

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

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

diffstat:
 pacman/Makefile | 6 +++---
 pacman/PLIST    | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs:
diff --git a/pacman/Makefile b/pacman/Makefile
index 6b113cbf2a..f6877512d6 100644
--- a/pacman/Makefile
+++ b/pacman/Makefile
@@ -19,9 +19,9 @@ PKGCONFIG_OVERRIDE+=	lib/libalpm/libalpm.pc.in
 
 EGDIR=      ${PREFIX}/share/examples/pacman
 
-CONF_FILES= ${DESTDIR}${EGDIR}/pacman.conf ${PKG_SYSCONFDIR}/pacman.conf \
-            ${DESTDIR}${EGDIR}/makepkg.conf ${PKG_SYSCONFDIR}/makepkg.conf \
-            ${DESTDIR}${EGDIR}/bash_completion-pacman \
+CONF_FILES= ${EGDIR}/pacman.conf ${PKG_SYSCONFDIR}/pacman.conf \
+            ${EGDIR}/makepkg.conf ${PKG_SYSCONFDIR}/makepkg.conf \
+            ${EGDIR}/bash_completion-pacman \
               ${PKG_SYSCONFDIR}/bash_completion.d/pacman
 
 post-install:
diff --git a/pacman/PLIST b/pacman/PLIST
index af4dac2d7f..b69ce6ef55 100644
--- a/pacman/PLIST
+++ b/pacman/PLIST
@@ -219,6 +219,7 @@ share/pacman/PKGBUILD-vcs.proto
 share/pacman/PKGBUILD.proto
 share/pacman/proto.install
 share/zsh/site-functions/_pacman
+@pkgdir etc/bash_completion.d
 @pkgdir var/lib/pacman
 @pkgdir var/cache/pacman/pkg
 @pkgdir share/makepkg-template


Home | Main Index | Thread Index | Old Index