diff options
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/adduser/Makefile | 10 | ||||
-rw-r--r-- | usr.sbin/kbdmap/Makefile | 15 | ||||
-rw-r--r-- | usr.sbin/lpr/lp/Makefile | 6 | ||||
-rw-r--r-- | usr.sbin/manctl/Makefile | 6 | ||||
-rw-r--r-- | usr.sbin/mergemaster/Makefile | 5 | ||||
-rw-r--r-- | usr.sbin/named.reload/Makefile | 14 | ||||
-rw-r--r-- | usr.sbin/named.restart/Makefile | 12 | ||||
-rw-r--r-- | usr.sbin/periodic/Makefile | 7 | ||||
-rw-r--r-- | usr.sbin/pim6sd/Makefile | 5 | ||||
-rw-r--r-- | usr.sbin/pkg_install/update/Makefile | 5 | ||||
-rw-r--r-- | usr.sbin/pkg_install/version/Makefile | 5 | ||||
-rw-r--r-- | usr.sbin/setkey/Makefile | 12 | ||||
-rw-r--r-- | usr.sbin/spkrtest/Makefile | 5 |
13 files changed, 26 insertions, 81 deletions
diff --git a/usr.sbin/adduser/Makefile b/usr.sbin/adduser/Makefile index 5a4db550d3e7..66eec824edec 100644 --- a/usr.sbin/adduser/Makefile +++ b/usr.sbin/adduser/Makefile @@ -2,13 +2,7 @@ MAINTAINER= wosch -SCRIPTS= adduser.perl rmuser.perl -MAN= adduser.8 rmuser.8 - -beforeinstall: -.for script in ${SCRIPTS} - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/${script} ${DESTDIR}${BINDIR}/${script:R} -.endfor +SCRIPTS=adduser.perl rmuser.perl +MAN= adduser.8 rmuser.8 .include <bsd.prog.mk> diff --git a/usr.sbin/kbdmap/Makefile b/usr.sbin/kbdmap/Makefile index 17413d3ed4e8..b2f660954f2d 100644 --- a/usr.sbin/kbdmap/Makefile +++ b/usr.sbin/kbdmap/Makefile @@ -1,19 +1,10 @@ -# Makefile for kbdmap / vidfont # $FreeBSD$ MAINTAINER= wosch - -SCRIPT= ${.CURDIR}/kbdmap.pl +SCRIPTS=${.CURDIR}/kbdmap.pl +MAN= kbdmap.1 LINKS= ${BINDIR}/kbdmap ${BINDIR}/vidfont -MAN= kbdmap.1 -MLINKS= kbdmap.1 vidfont.1 - -all: - @echo -n - -beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${SCRIPT} ${DESTDIR}${BINDIR}/kbdmap +MLINKS= kbdmap.1 vidfont.1 .include <bsd.prog.mk> diff --git a/usr.sbin/lpr/lp/Makefile b/usr.sbin/lpr/lp/Makefile index df12501153cd..8876472e1220 100644 --- a/usr.sbin/lpr/lp/Makefile +++ b/usr.sbin/lpr/lp/Makefile @@ -1,10 +1,8 @@ # $FreeBSD$ -BINDIR= /usr/bin +SCRIPTS=lp.sh MAN= lp.1 -beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/lp.sh ${DESTDIR}${BINDIR}/lp +BINDIR= /usr/bin .include <bsd.prog.mk> diff --git a/usr.sbin/manctl/Makefile b/usr.sbin/manctl/Makefile index 294dc5123aeb..9e0c12ecb9a9 100644 --- a/usr.sbin/manctl/Makefile +++ b/usr.sbin/manctl/Makefile @@ -1,10 +1,6 @@ -# Makefile # $FreeBSD$ +SCRIPTS=manctl.sh MAN= manctl.8 -beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/manctl.sh ${DESTDIR}${BINDIR}/manctl - .include <bsd.prog.mk> diff --git a/usr.sbin/mergemaster/Makefile b/usr.sbin/mergemaster/Makefile index c7e758cf0a39..d65784aa4281 100644 --- a/usr.sbin/mergemaster/Makefile +++ b/usr.sbin/mergemaster/Makefile @@ -1,11 +1,8 @@ # $FreeBSD$ MAINTAINER= dougb@FreeBSD.org +SCRIPTS= mergemaster.sh MAN= mergemaster.8 -beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/mergemaster.sh ${DESTDIR}${BINDIR}/mergemaster - .include <bsd.prog.mk> diff --git a/usr.sbin/named.reload/Makefile b/usr.sbin/named.reload/Makefile index 514f8e567828..5cb467a19b4c 100644 --- a/usr.sbin/named.reload/Makefile +++ b/usr.sbin/named.reload/Makefile @@ -2,18 +2,14 @@ .include "${.CURDIR}/../named/Makefile.inc" -MAN= named.reload.8 -CLEANFILES+= named.reload - -all: named.reload - -realinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - named.reload ${DESTDIR}${BINDIR} +SCRIPTS= named.reload +MAN= named.reload.8 +CLEANFILES+= ${SCRIPTS} +SCRIPTSNAME= ${SCRIPTS} named.reload: named.reload.sh ${BIND_DIR}/Makefile sed -e "s|%INDOT%|${INDOT}|" \ -e "s|%DESTSBIN%|${DESTSBIN}|" \ - < ${.CURDIR}/named.reload.sh > named.reload + < ${.CURDIR}/named.reload.sh > ${.TARGET} .include <bsd.prog.mk> diff --git a/usr.sbin/named.restart/Makefile b/usr.sbin/named.restart/Makefile index 8c52d21de99b..e974bf8ae0ce 100644 --- a/usr.sbin/named.restart/Makefile +++ b/usr.sbin/named.restart/Makefile @@ -2,14 +2,10 @@ .include "${.CURDIR}/../named/Makefile.inc" -MAN= named.restart.8 -CLEANFILES+= named.restart - -all: named.restart - -realinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - named.restart ${DESTDIR}${BINDIR} +SCRIPTS= named.restart +MAN= named.restart.8 +CLEANFILES+= ${SCRIPTS} +SCRIPTSNAME= ${SCRIPTS} named.restart: named.restart.sh ${BIND_DIR}/Makefile sed -e "s|%INDOT%|${INDOT}|" \ diff --git a/usr.sbin/periodic/Makefile b/usr.sbin/periodic/Makefile index 612264026f53..875d078435ea 100644 --- a/usr.sbin/periodic/Makefile +++ b/usr.sbin/periodic/Makefile @@ -1,11 +1,6 @@ -# Makefile for periodic(8) -# # $FreeBSD$ +SCRIPTS=periodic.sh MAN= periodic.8 -beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/periodic.sh ${DESTDIR}${BINDIR}/periodic - .include <bsd.prog.mk> diff --git a/usr.sbin/pim6sd/Makefile b/usr.sbin/pim6sd/Makefile index a3db48d614f4..882973a78fcd 100644 --- a/usr.sbin/pim6sd/Makefile +++ b/usr.sbin/pim6sd/Makefile @@ -89,11 +89,8 @@ CFLAGS+=-DINET6 -DPIM -DIOCTL_OK_ON_RAW_SOCKET -DHAVE_GETIFADDRS CFLAGS+=-DHAVE_STDARG_H DPADD= ${LIBY} ${LIBL} LDADD= -ly -ll +SCRIPTS=pim6stat MAN= pim6stat.1 pim6sd.conf.5 pim6sd.8 -beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/pim6stat ${DESTDIR}${BINDIR} - .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/update/Makefile b/usr.sbin/pkg_install/update/Makefile index 2e3888081133..73afa1fa4105 100644 --- a/usr.sbin/pkg_install/update/Makefile +++ b/usr.sbin/pkg_install/update/Makefile @@ -1,9 +1,6 @@ # $FreeBSD$ +SCRIPTS= pkg_update.pl MAN= pkg_update.1 -beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/pkg_update.pl ${DESTDIR}${BINDIR}/pkg_update - .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/version/Makefile b/usr.sbin/pkg_install/version/Makefile index b9c4d1cf07c4..1a06d02f3077 100644 --- a/usr.sbin/pkg_install/version/Makefile +++ b/usr.sbin/pkg_install/version/Makefile @@ -1,12 +1,9 @@ # $FreeBSD$ MAINTAINER= bmah@FreeBSD.org +SCRIPTS= pkg_version.pl MAN= pkg_version.1 -beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/pkg_version.pl ${DESTDIR}${BINDIR}/pkg_version - test: ./test-pkg_version.sh diff --git a/usr.sbin/setkey/Makefile b/usr.sbin/setkey/Makefile index e6aed6487575..0ffacf0610b9 100644 --- a/usr.sbin/setkey/Makefile +++ b/usr.sbin/setkey/Makefile @@ -41,14 +41,6 @@ YFLAGS+=-d SRCS+= pfkey.c pfkey_dump.c key_debug.c ipsec_strerror.c CFLAGS+=-I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netkey -SCRIPTS= scriptdump - -BINOWN = root -BINGRP = bin -BINMODE = 555 - -all: ${PROG} scriptdump - SRCS+=y.tab.h y.tab.h: parse.y CFLAGS+=-DIPSEC_DEBUG -DINET6 -DYY_NO_UNPUT -I. @@ -56,8 +48,10 @@ DPADD+= ${LIBIPSEC} LDADD+= -lipsec CLEANFILES+= scriptdump y.tab.h +SCRIPTS=scriptdump MAN= setkey.8 -LOCALPREFIX= /usr/local + +LOCALPREFIX= /usr scriptdump: scriptdump.pl sed -e 's#@LOCALPREFIX@#${LOCALPREFIX}#' < $> > scriptdump diff --git a/usr.sbin/spkrtest/Makefile b/usr.sbin/spkrtest/Makefile index 97a22682928c..e323c2c3630b 100644 --- a/usr.sbin/spkrtest/Makefile +++ b/usr.sbin/spkrtest/Makefile @@ -2,10 +2,7 @@ MAINTAINER= wosch +SCRIPTS=spkrtest.pl MAN= spkrtest.8 -beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/spkrtest.pl ${DESTDIR}${BINDIR}/spkrtest - .include <bsd.prog.mk> |