pkgsrc-WIP-changes archive

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

irc-hybrid: Rename HYBRID_DOC_PLACE to DOCDIR and avoid HYBRID_DOC (NFCI)



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Thu Jan 31 13:57:45 2019 +0100
Changeset:	fb08122ad7ce4c21840b6d15c5226b11406167c7

Modified Files:
	ircd-hybrid/Makefile

Log Message:
irc-hybrid: Rename HYBRID_DOC_PLACE to DOCDIR and avoid HYBRID_DOC (NFCI)

(This is a bit more consistent with other packages that define a DOCDIR.)

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

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

diffstat:
 ircd-hybrid/Makefile | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diffs:
diff --git a/ircd-hybrid/Makefile b/ircd-hybrid/Makefile
index ec4dd80717..493c634841 100644
--- a/ircd-hybrid/Makefile
+++ b/ircd-hybrid/Makefile
@@ -20,10 +20,9 @@ BUILD_DEFS+=	VARBASE IRCD_HYBRID_IRC_USER IRCD_HYBRID_IRC_GROUP
 PKG_SYSCONFSUBDIR=	ircd-hybrid
 RCD_SCRIPTS=		ircd-hybrid
 
-HYBRID_DOC_PLACE=	share/doc/ircd-hybrid
-HYBRID_DOC=		${PREFIX}/${HYBRID_DOC_PLACE}
+DOCDIR=			share/doc/ircd-hybrid
 
-INSTALLATION_DIRS+=	${HYBRID_DOC_PLACE}/doc
+INSTALLATION_DIRS+=	${DOCDIR}/doc
 
 OWN_DIRS_PERMS+=	${VARBASE}/log/ircd-hybrid \
 			${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 0770
@@ -68,15 +67,15 @@ CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/log/ircd-hybrid
 .include "options.mk"
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${HYBRID_DOC}
-	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${HYBRID_DOC}
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${PREFIX}/${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/tools/README.mkpasswd \
-		${DESTDIR}${HYBRID_DOC}/README.ircd-hybrid-mkpasswd
+		${DESTDIR}${PREFIX}/${DOCDIR}/README.ircd-hybrid-mkpasswd
 
-	${INSTALL_DATA} ${WRKSRC}/doc/*.conf ${DESTDIR}${HYBRID_DOC}/doc
-	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${HYBRID_DOC}/doc
-	${INSTALL_DATA_DIR} ${DESTDIR}${HYBRID_DOC}/doc/technical
-	${INSTALL_DATA} ${WRKSRC}/doc/technical/*.txt ${DESTDIR}${HYBRID_DOC}/doc/technical
+	${INSTALL_DATA} ${WRKSRC}/doc/*.conf ${DESTDIR}${PREFIX}/${DOCDIR}/doc
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/${DOCDIR}/doc
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${DOCDIR}/doc/technical
+	${INSTALL_DATA} ${WRKSRC}/doc/technical/*.txt ${DESTDIR}${PREFIX}/${DOCDIR}/doc/technical
 
 	${MV} ${DESTDIR}${PREFIX}/bin/mkpasswd \
 		${DESTDIR}${PREFIX}/bin/ircd-hybrid-mkpasswd


Home | Main Index | Thread Index | Old Index