diff options
| author | jmc <jmc> | 2002-03-17 02:40:57 +0000 |
|---|---|---|
| committer | jmc <jmc> | 2002-03-17 02:40:57 +0000 |
| commit | d04db25a703b7c843640966a8d1dae50be6ed132 (patch) | |
| tree | 88571bcf2a7d8c7d6869ebcc21d29ef7114dd97d /graphics/gimp-base/Makefile | |
| parent | e4409ef8a99be3caafa699e5833805559dc9af9f (diff) | |
| download | pkgsrc-d04db25a703b7c843640966a8d1dae50be6ed132.tar.gz | |
Fix annoying error messages where gtk-config and glib-config get called when
they're not installed yet. Check for their existance via a separate !=
rule and then use that to wrap the calls to {gtk,glib}-config inside a
.if/.endif clause.
Diffstat (limited to 'graphics/gimp-base/Makefile')
| -rw-r--r-- | graphics/gimp-base/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/graphics/gimp-base/Makefile b/graphics/gimp-base/Makefile index 1a8b7f0670d..48f4842f271 100644 --- a/graphics/gimp-base/Makefile +++ b/graphics/gimp-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:08 fredb Exp $ +# $NetBSD: Makefile,v 1.3 2002/03/17 02:40:57 jmc Exp $ DISTNAME= gimp-1.2.3 PKGNAME= gimp-base-1.2.3 @@ -38,6 +38,9 @@ MAKE_ENV+= X11BASE=${X11BASE} PLIST_SUBST+= LOCALBASE=${LOCALBASE} +CONFIG_EXISTS!= /bin/sh -c "type gtk-config glib-config > /dev/null"; \ + if [ $$? = 0 ]; then echo yes; else echo no; fi +.if (${CONFIG_EXISTS} == "yes") # make sure the installed "gimptool" doesn't refer to .buildlink ORIG_GTK_CFLAGS!= gtk-config --cflags GIMPTOOL_SUBST= -e "s|@ORIG_GTK_CFLAGS@|${ORIG_GTK_CFLAGS}|g" @@ -52,6 +55,7 @@ GIMPTOOL_SUBST+= -e "s|@ORIG_CFLAGS@|${ORIG_CFLAGS}|g" ORIG_LDFLAGS= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib ORIG_LDFLAGS+= -L${X11BASE}/lib -Wl,-R${X11BASE}/lib GIMPTOOL_SUBST+= -e "s|@ORIG_LDFLAGS@|${ORIG_LDFLAGS}|g" +.endif # Remove -I$(includedir) from the INCLUDES passed to the compiler as this # defeats buildlink. |