diff options
| -rw-r--r-- | misc/mirmon/Makefile | 9 | ||||
| -rw-r--r-- | net/ywho/Makefile | 7 |
2 files changed, 8 insertions, 8 deletions
diff --git a/misc/mirmon/Makefile b/misc/mirmon/Makefile index 1495fe00d7d..0dc2fbfc2e7 100644 --- a/misc/mirmon/Makefile +++ b/misc/mirmon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/07/21 13:15:22 heinz Exp $ +# $NetBSD: Makefile,v 1.2 2007/09/20 08:54:18 rillig Exp $ # DISTNAME= mirmon-1.36 @@ -18,13 +18,13 @@ USE_LANGUAGES= # empty EG_DIR= ${PREFIX}/share/examples/mirmon MIRMONDIR= ${PREFIX}/share/mirmon -SUBST_CLASSES+= mirmon1 mirmon2 - +SUBST_CLASSES+= mirmon1 SUBST_STAGE.mirmon1= pre-configure SUBST_FILES.mirmon1= mirmon SUBST_SED.mirmon1+= -e s!/etc/!${PKG_SYSCONFDIR}/!g SUBST_SED.mirmon1+= -e s!/sw/!${LOCALBASE}/!g +SUBST_CLASSES+= mirmon2 SUBST_STAGE.mirmon2= pre-configure SUBST_FILES.mirmon2= ${WRKDIR}/mirmon.conf SUBST_SED.mirmon2+= -e s!@@MIRMONDIR@@!${MIRMONDIR}!g @@ -43,7 +43,6 @@ do-install: ${INSTALL_DATA_DIR} ${MIRMONDIR} ${INSTALL_DATA} ${WRKSRC}/countries.list ${MIRMONDIR} ${INSTALL_DATA_DIR} ${MIRMONDIR}/icons - cd ${WRKSRC}/icons && \ - for f in *; do ${INSTALL_DATA} $${f} ${MIRMONDIR}/icons; done + cd ${WRKSRC}/icons && ${INSTALL_DATA} * ${MIRMONDIR}/icons .include "../../mk/bsd.pkg.mk" diff --git a/net/ywho/Makefile b/net/ywho/Makefile index 330eabc1fc1..9620520cd0a 100644 --- a/net/ywho/Makefile +++ b/net/ywho/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:03 tv Exp $ +# $NetBSD: Makefile,v 1.9 2007/09/20 08:57:53 rillig Exp $ # DISTNAME= ywho-1.3 @@ -9,7 +9,8 @@ MAINTAINER= kim@tac.nyc.ny.us COMMENT= Who, users, uptime on clients in a sun-RPC network NO_CONFIGURE= yes -BUILD_TARGET= all DEST=${PREFIX} -INSTALL_TARGET= install install.man DEST=${PREFIX} +MAKE_FLAGS+= DEST=${PREFIX} +BUILD_TARGET= all +INSTALL_TARGET= install install.man .include "../../mk/bsd.pkg.mk" |