diff options
author | agc <agc> | 2000-07-10 10:40:39 +0000 |
---|---|---|
committer | agc <agc> | 2000-07-10 10:40:39 +0000 |
commit | 91eba316c77ef386b236998f54da562a655d4fff (patch) | |
tree | eb8c75c4d78a779a039aa1995f70225e25ce9df1 /games | |
parent | 7370f62dfda2fbad92bec13c208ebecb3a567753 (diff) | |
download | pkgsrc-91eba316c77ef386b236998f54da562a655d4fff.tar.gz |
Hardcoding X11PREFIX into package Makefiles forces the user to install
xpkgwedge once, before any other packages have been installed, and
never to delete it. This change finds the prefix of the installed
pre-req package using pkg_info(1), and allows packages to be found in
${X11BASE} and ${LOCALBASE}, not just ${X11PREFIX} - from mail from
Dave Sainty <dave@dtsp.co.nz>, munged slightly by myself.
Diffstat (limited to 'games')
-rw-r--r-- | games/baduki/Makefile | 9 | ||||
-rw-r--r-- | games/xarchon/Makefile | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/games/baduki/Makefile b/games/baduki/Makefile index 4f218ccdbd9..20d3ac96024 100644 --- a/games/baduki/Makefile +++ b/games/baduki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/06/30 10:04:46 agc Exp $ +# $NetBSD: Makefile,v 1.9 2000/07/10 10:40:40 agc Exp $ DISTNAME= baduki-0.2.9 CATEGORIES= games @@ -11,10 +11,13 @@ DEPENDS+= gtk+-1.2.*:../../x11/gtk USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix=${X11PREFIX} --without-included-gettext -CONFIGURE_ENV+= GTK_CONFIG="${X11PREFIX}/bin/gtk-config" +CONFIGURE_ARGS+= --with-gtk-prefix=${GTK_PREFIX} +CONFIGURE_ARGS+= --without-included-gettext +CONFIGURE_ENV+= GTK_CONFIG="${GTK_PREFIX}/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 237bdef9c7b..12fcdf8b33b 100644 --- a/games/xarchon/Makefile +++ b/games/xarchon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2000/06/30 10:04:46 agc Exp $ +# $NetBSD: Makefile,v 1.10 2000/07/10 10:40:40 agc Exp $ # DISTNAME= xarchon-0.50 @@ -14,10 +14,13 @@ DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= esound-*:../../audio/esound GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-xpm-prefix=${X11PREFIX} \ - --with-gtk-prefix=${X11PREFIX} \ +CONFIGURE_ARGS+=--with-xpm-prefix=${XPM_PREFIX} \ + --with-gtk-prefix=${GTK_PREFIX} \ --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" |