pkgsrc-WIP-changes archive

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

Properly deal with the config file.



Module Name:	pkgsrc-wip
Committed By:	youri <youri%NetBSD.org@localhost>
Pushed By:	youri
Date:		Sat Mar 19 15:52:10 2016 +0100
Changeset:	6c52e60bf35a74f79d6b11c6138021fc1a0988f0

Modified Files:
	libpwquality/Makefile
	libpwquality/PLIST

Log Message:
Properly deal with the config file.

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

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

diffstat:
 libpwquality/Makefile | 9 ++++++---
 libpwquality/PLIST    | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs:
diff --git a/libpwquality/Makefile b/libpwquality/Makefile
index f341298..3620787 100644
--- a/libpwquality/Makefile
+++ b/libpwquality/Makefile
@@ -13,14 +13,17 @@ LICENSE=	gnu-gpl-v2
 USE_TOOLS+=		automake autoconf aclocal gmake
 GNU_CONFIGURE=		yes
 
+CONFIG_DIR=		share/examples/pwquality
+
 CONFIGURE_ARGS+=	--disable-pam
 CONFIGURE_ARGS+=	--with-python-binary=${PYTHONBIN}
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/${CONFIG_DIR}
 
-INSTALLATION_DIRS+=	${PKG_SYSCONFDIR}/security/
+INSTALLATION_DIRS+=	${PKG_SYSCONFDIR}/security
 
 PY_PATCHPLIST=	yes
-EGDIR=		etc/security
-CONF_FILES=	${EGDIR}/pwquality.conf \
+
+CONF_FILES=	${CONFIG_DIR}/security/pwquality.conf \
 			${PKG_SYSCONFDIR}/security/pwquality.conf
 
 pre-configure:
diff --git a/libpwquality/PLIST b/libpwquality/PLIST
index aa7e3c4..f15dc4a 100644
--- a/libpwquality/PLIST
+++ b/libpwquality/PLIST
@@ -1,7 +1,6 @@
 @comment $NetBSD$
 bin/pwmake
 bin/pwscore
-etc/security/pwquality.conf
 include/pwquality.h
 lib/libpwquality.la
 lib/pkgconfig/pwquality.pc
@@ -10,6 +9,7 @@ man/man1/pwmake.1
 man/man1/pwscore.1
 man/man3/pwquality.3
 man/man5/pwquality.conf.5
+share/examples/pwquality/security/pwquality.conf
 share/locale/ar/LC_MESSAGES/libpwquality.mo
 share/locale/as/LC_MESSAGES/libpwquality.mo
 share/locale/bg/LC_MESSAGES/libpwquality.mo


Home | Main Index | Thread Index | Old Index