diff options
| author | agc <agc@pkgsrc.org> | 2000-07-10 13:29:38 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2000-07-10 13:29:38 +0000 |
| commit | 5dfd195358cb62501662076058e27c1233be2e34 (patch) | |
| tree | 8ccedfb0e66ea4f1f5fe663ddaa99c7fb7d28271 | |
| parent | dab9a8dec8f7e8ac97643e8611fe933c5b08070c (diff) | |
| download | pkgsrc-5dfd195358cb62501662076058e27c1233be2e34.tar.gz | |
Work out in which directory xpm and gtk are installed as part of the
shell command, rather than as a make(1) preprocessor-like directive.
Pointed out by Thomas Klausner.
| -rw-r--r-- | games/baduki/Makefile | 8 | ||||
| -rw-r--r-- | games/xarchon/Makefile | 9 |
2 files changed, 6 insertions, 11 deletions
diff --git a/games/baduki/Makefile b/games/baduki/Makefile index 20d3ac96024..05584ba1b4c 100644 --- a/games/baduki/Makefile +++ b/games/baduki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2000/07/10 10:40:40 agc Exp $ +# $NetBSD: Makefile,v 1.10 2000/07/10 13:29:38 agc Exp $ DISTNAME= baduki-0.2.9 CATEGORIES= games @@ -11,13 +11,11 @@ DEPENDS+= gtk+-1.2.*:../../x11/gtk USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix=${GTK_PREFIX} +CONFIGURE_ARGS+= --with-gtk-prefix=`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'` CONFIGURE_ARGS+= --without-included-gettext -CONFIGURE_ENV+= GTK_CONFIG="${GTK_PREFIX}/bin/gtk-config" +CONFIGURE_ENV+= GTK_CONFIG="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`/bin/gtk-config" LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" -GTK_PREFIX!= ${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}' - .include "../../mk/bsd.pkg.mk" diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile index 12fcdf8b33b..0d78d4feb8a 100644 --- a/games/xarchon/Makefile +++ b/games/xarchon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/07/10 10:40:40 agc Exp $ +# $NetBSD: Makefile,v 1.11 2000/07/10 13:29:39 agc Exp $ # DISTNAME= xarchon-0.50 @@ -14,13 +14,10 @@ DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= esound-*:../../audio/esound GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-xpm-prefix=${XPM_PREFIX} \ - --with-gtk-prefix=${GTK_PREFIX} \ +CONFIGURE_ARGS+=--with-xpm-prefix=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'` \ + --with-gtk-prefix=`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'` \ --with-esd-prefix=${LOCALBASE} -GTK_PREFIX!= ${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}' -XPM_PREFIX!= ${PKG_INFO} -qp xpm | ${AWK} '{print $$2}' - .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" |