pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/print print/cups{, 15}: Don't make ${CUPS_CONFDIR} with...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1a6d7cd463c4
branches:  trunk
changeset: 366968:1a6d7cd463c4
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Aug 20 23:55:54 2017 +0000

description:
print/cups{,15}: Don't make ${CUPS_CONFDIR} with INSTALLATION_DIRS.

${CUPS_CONFDIR} (${PKG_SYSCONFDIR}) may be located outside of
${PREFIX}, which causes a installation failure due to the checks
added in mk/install/install.mk.

Remove ${CUPS_CONFDIR} from INSTALLATION_DIRS since it is created
by the package install script at PRE-INSTALL time.

Fixes pkg/52481 reported by Hauke Fath.

diffstat:

 print/cups/Makefile   |  4 ++--
 print/cups15/Makefile |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 6f0f42b4bc27 -r 1a6d7cd463c4 print/cups/Makefile
--- a/print/cups/Makefile       Sun Aug 20 23:54:33 2017 +0000
+++ b/print/cups/Makefile       Sun Aug 20 23:55:54 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.248 2017/08/01 14:59:04 wiz Exp $
+# $NetBSD: Makefile,v 1.249 2017/08/20 23:55:54 jlam Exp $
 
 DISTNAME=      cups-2.2.3-source
 PKGNAME=       ${DISTNAME:S/-source//}
@@ -131,7 +131,7 @@
 SUBST_STAGE.piefix=    post-patch
 .endif
 
-INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR} ${MIMEDIR} ${CUPS_CONFDIR}
+INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR} ${MIMEDIR}
 INSTALL_ENV+=          DSTROOT=${DESTDIR}
 
 pre-configure:
diff -r 6f0f42b4bc27 -r 1a6d7cd463c4 print/cups15/Makefile
--- a/print/cups15/Makefile     Sun Aug 20 23:54:33 2017 +0000
+++ b/print/cups15/Makefile     Sun Aug 20 23:55:54 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2017/08/01 14:59:04 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2017/08/20 23:55:54 jlam Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -159,7 +159,7 @@
 SUBST_STAGE.piefix=    post-patch
 .endif
 
-INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR} ${MIMEDIR} ${CUPS_CONFDIR}
+INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR} ${MIMEDIR}
 INSTALL_ENV+=          DSTROOT=${DESTDIR}
 
 pre-configure:



Home | Main Index | Thread Index | Old Index