From 80ad717ecacd745808809df01d8354d415600cba Mon Sep 17 00:00:00 2001 From: tron Date: Tue, 18 Dec 2007 10:15:15 +0000 Subject: Defeat very evil shell script code which tries to use "which" to find "gtkdoc-rebase" (which depending on what flavour of "which" your operating system provides will go horribly wrong). This fixes the build under Mac OS X. --- x11/gtk2/Makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'x11') diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 144a082a16c..61715c24d1b 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.151 2007/12/17 20:24:13 drochner Exp $ +# $NetBSD: Makefile,v 1.152 2007/12/18 10:15:15 tron Exp $ DISTNAME= gtk+-2.12.3 PKGNAME= ${DISTNAME:S/gtk/gtk2/} @@ -42,7 +42,7 @@ PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in REQD_DIRS+= ${PREFIX}/libdata/gtk-2.0 -BUILD_DIRS= ${WRKSRC} ${WRKSRC}/demos/gtk-demo +BUILD_DIRS= . demos/gtk-demo .include "../../mk/bsd.prefs.mk" @@ -85,6 +85,16 @@ PRINT_PLIST_AWK+= /^share\/icons\/hicolor\/icon-theme.cache$$/ { next; } _BUILDING_GTK2= yes .include "modules.mk" +# Defeat evil shell script code which tries to find "gtkdoc-rebase" +# via the "which" command. This goes horribly wrong if "gtkdoc-rebase" +# is not installed at the "which" command prints an error message +# to standard output. +pre-install: + ${RM} -f ${BUILDLINK_DIR}/bin/which + ${ECHO} >${BUILDLINK_DIR}/bin/which "#!${SH}" + ${ECHO} >>${BUILDLINK_DIR}/bin/which "exit 0" + ${CHMOD} +x ${BUILDLINK_DIR}/bin/which + .include "../../devel/atk/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -- cgit v1.2.3