diff options
| author | jlam <jlam> | 2001-08-24 05:35:17 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-08-24 05:35:17 +0000 |
| commit | d5f9e500d646ee023124b2446bd25572a4485c6e (patch) | |
| tree | 26d7a9d3b709260b4b3868104ec3b9756a99eac2 /wm | |
| parent | bae0c01bf4080b74c916904e3e1ea55a96d38b52 (diff) | |
| download | pkgsrc-d5f9e500d646ee023124b2446bd25572a4485c6e.tar.gz | |
Include Makefile.common near the start of the package Makefile, and
manually include bsd.pkg.mk in each package.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/icewm-gnome/Makefile | 13 | ||||
| -rw-r--r-- | wm/icewm/Makefile | 5 | ||||
| -rw-r--r-- | wm/icewm/Makefile.common | 4 |
3 files changed, 9 insertions, 13 deletions
diff --git a/wm/icewm-gnome/Makefile b/wm/icewm-gnome/Makefile index e0c4887692b..a8c5348b3a0 100644 --- a/wm/icewm-gnome/Makefile +++ b/wm/icewm-gnome/Makefile @@ -1,17 +1,14 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:41 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/08/24 05:35:18 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-gnome-/} - COMMENT= small, fast and light-weight window manager (GNOME version) -DEPENDS+= gnome-libs-*:../../x11/gnome-libs - CONFLICTS+= icewm-[0-9]* -USE_X11= yes +.include "../../wm/icewm/Makefile.common" -EVAL_PREFIX+= GNOMEDIR=gnome-libs -CONFIGURE_ARGS+= --with-gnome-menus="${GNOMEDIR}/bin/gnome-config" +CONFIGURE_ARGS+= --with-gnome-menus="${GNOME_CONFIG}" CONFIGURE_ARGS+= --with-imlib -.include "../../wm/icewm/Makefile.common" +.include "../../x11/gnome-libs/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile index ad39475bfcf..ae1ca1b05a8 100644 --- a/wm/icewm/Makefile +++ b/wm/icewm/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2001/06/30 10:25:01 zuntum Exp $ +# $NetBSD: Makefile,v 1.4 2001/08/24 05:35:17 jlam Exp $ # COMMENT= small, fast and light-weight window manager CONFLICTS+= icewm-gnome-[0-9]* -.include "../../graphics/xpm/buildlink.mk" .include "../../wm/icewm/Makefile.common" +.include "../../graphics/xpm/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common index 6e1a9dffa07..8a700240a76 100644 --- a/wm/icewm/Makefile.common +++ b/wm/icewm/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2001/06/30 10:25:01 zuntum Exp $ +# $NetBSD: Makefile.common,v 1.5 2001/08/24 05:35:17 jlam Exp $ # DISTNAME= icewm-1.0.4 @@ -37,5 +37,3 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}; \ done ${INSTALL_DATA} ${WRKSRC}/doc/icewm*.html ${HTMLDIR} - -.include "../../mk/bsd.pkg.mk" |