diff options
| author | jlam <jlam@pkgsrc.org> | 2001-07-14 02:27:35 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-07-14 02:27:35 +0000 |
| commit | 751004b137e9d46eecba1981aed9fcbfcae3136b (patch) | |
| tree | fe1cd664aaff3a2c147791e658b09aeaaea85ba0 /wm | |
| parent | 0727f70109b1ed923f74fe72deb54b3ceddb6e70 (diff) | |
| download | pkgsrc-751004b137e9d46eecba1981aed9fcbfcae3136b.tar.gz | |
Don't include bsd.pkg.mk in Makefile.common -- just include it in the
package Makefile.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/wmx-current/Makefile | 11 | ||||
| -rw-r--r-- | wm/wmx-current/Makefile.common | 6 | ||||
| -rw-r--r-- | wm/wmx-gnome-current/Makefile | 6 |
3 files changed, 12 insertions, 11 deletions
diff --git a/wm/wmx-current/Makefile b/wm/wmx-current/Makefile index 6749fa477af..c736582a402 100644 --- a/wm/wmx-current/Makefile +++ b/wm/wmx-current/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2001/06/18 21:32:23 jlam Exp $ - -PKGNAME= wmx-${WMX_VERS} - -COMMENT= another X11 window manager based on wm2 +# $NetBSD: Makefile,v 1.4 2001/07/14 02:27:35 jlam Exp $ USE_BUILDLINK_ONLY= # defined .include "../../wm/wmx-current/Makefile.common" + +PKGNAME= wmx-${WMX_VERS} +COMMENT= another X11 window manager based on wm2 + +.include "../../mk/bsd.pkg.mk" diff --git a/wm/wmx-current/Makefile.common b/wm/wmx-current/Makefile.common index e37f59ca715..8e8c36ada48 100644 --- a/wm/wmx-current/Makefile.common +++ b/wm/wmx-current/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2001/06/18 05:09:08 jlam Exp $ +# $NetBSD: Makefile.common,v 1.5 2001/07/14 02:27:35 jlam Exp $ DISTNAME= wmx-6pre6 WMX_VERS= 5.0.6 @@ -18,8 +18,6 @@ DISTINFO_FILE= ${.CURDIR}/../../wm/wmx-current/distinfo PATCHDIR= ${.CURDIR}/../../wm/wmx-current/patches PLIST_SRC= ${.CURDIR}/../../wm/wmx-current/pkg/PLIST -.include "../../graphics/xpm/buildlink.mk" - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmx ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmx @@ -27,4 +25,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README.contrib ${PREFIX}/share/doc/wmx ${INSTALL_DATA_DIR} ${PREFIX}/etc/wmx -.include "../../mk/bsd.pkg.mk" +.include "../../graphics/xpm/buildlink.mk" diff --git a/wm/wmx-gnome-current/Makefile b/wm/wmx-gnome-current/Makefile index a0c0c6f9ad3..b59d563c0ad 100644 --- a/wm/wmx-gnome-current/Makefile +++ b/wm/wmx-gnome-current/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:56 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/07/14 02:27:35 jlam Exp $ + +.include "../../wm/wmx-current/Makefile.common" PKGNAME= wmx-gnome-${WMX_VERS} CATEGORIES+= gnome @@ -10,4 +12,4 @@ CPPFLAGS+= -DCONFIG_GNOME_BUTTON_COMPLIANCE=True CXXFLAGS+= -DCONFIG_GNOME_COMPLIANCE=True CXXFLAGS+= -DCONFIG_GNOME_BUTTON_COMPLIANCE=True -.include "../../wm/wmx-current/Makefile.common" +.include "../../mk/bsd.pkg.mk" |