diff options
| author | jlam <jlam@pkgsrc.org> | 2017-08-20 23:55:54 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2017-08-20 23:55:54 +0000 |
| commit | 6ad7985247621cc5df7af16e974a7223e69ec076 (patch) | |
| tree | 2190a414bac8f431e65a806a5a4fe13a00b0051d | |
| parent | 0b5d43f8949cf8429e4125bb5b730cfe11314584 (diff) | |
| download | pkgsrc-6ad7985247621cc5df7af16e974a7223e69ec076.tar.gz | |
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.
| -rw-r--r-- | print/cups/Makefile | 4 | ||||
| -rw-r--r-- | print/cups15/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index 4c63ef39304..d67b496ad2c 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -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_SED.piefix= -e 's|@PIEFLAGS@||g' 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 --git a/print/cups15/Makefile b/print/cups15/Makefile index 63f327605d8..1cf76841ff3 100644 --- a/print/cups15/Makefile +++ b/print/cups15/Makefile @@ -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_SED.piefix= -e 's|@PIEFLAGS@||g' SUBST_STAGE.piefix= post-patch .endif -INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR} ${CUPS_CONFDIR} +INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR} INSTALL_ENV+= DSTROOT=${DESTDIR} pre-configure: |