pkgsrc-Changes archive

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

CVS commit: pkgsrc/textproc/redland



Module Name:    pkgsrc
Committed By:   leot
Date:           Wed Nov  8 22:38:29 UTC 2017

Modified Files:
        pkgsrc/textproc/redland: Makefile

Log Message:
redland: Fix installation if gtk-doc package is already installed

By default redland is configured with `--disable-gtk-doc'. However,
despite that it will checks several `gtkdoc-*' tools anyway ending
in an failure during the installation phase because only a couple
of them are available.

Add a kludge via CONFIGURE_ENV to avoid picking up gtkdoc-* tools.

Pointed out by <oster>, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/textproc/redland/Makefile

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

Modified files:

Index: pkgsrc/textproc/redland/Makefile
diff -u pkgsrc/textproc/redland/Makefile:1.35 pkgsrc/textproc/redland/Makefile:1.36
--- pkgsrc/textproc/redland/Makefile:1.35       Thu Aug 24 20:03:02 2017
+++ pkgsrc/textproc/redland/Makefile    Wed Nov  8 22:38:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2017/08/24 20:03:02 adam Exp $
+# $NetBSD: Makefile,v 1.36 2017/11/08 22:38:28 leot Exp $
 
 DISTNAME=      redland-1.0.17
 PKGREVISION=   8
@@ -14,6 +14,12 @@ USE_TOOLS+=  gmake perl pkg-config
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 
+# XXX: Kludge to avoid uncoditionally pick up some gtkdoc-* tools if gtk-doc
+# XXX: package is installed and then fails in the installation phase.
+CONFIGURE_ENV+=                ac_cv_path_GTKDOC_CHECK= \
+                       ac_cv_path_GTKDOC_REBASE= \
+                       ac_cv_path_GTKDOC_MKPDF=
+
 .include "../../mk/bdb.buildlink3.mk"
 
 .if empty(BDB_LIBS)



Home | Main Index | Thread Index | Old Index