From ccaec6d133b1583e991174634bb28bcee9886897 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Mon, 17 Dec 2001 16:02:15 +0000 Subject: [PATCH] Install files via FILES. --- usr.bin/file/Makefile | 9 +++------ usr.bin/gprof/Makefile | 2 ++ usr.bin/mail/Makefile | 7 +++---- usr.bin/units/Makefile | 6 ++---- usr.bin/vgrind/Makefile | 13 +++++-------- 5 files changed, 15 insertions(+), 22 deletions(-) diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile index 3a1e4b080e56..c55055e5fb22 100644 --- a/usr.bin/file/Makefile +++ b/usr.bin/file/Makefile @@ -29,13 +29,15 @@ SRCS= file.c apprentice.c fsmagic.c softmagic.c ascmagic.c \ # compress.c is_tar.c readelf.c internat.c print.c MAGICPATH= /usr/share/misc -MAGICMODE= 444 CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DBUILTIN_ELF -DELFCORE -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${SRCDIR} CLEANFILES+= magic magic.mgc magic.mime.mgc magic.mime.PITA +FILES= magic magic.mgc ${SRCDIR}/magic.mime magic.mime.mgc +FILESDIR= ${MAGICPATH} + MAGFILES= ${SRCDIR}/Header\ ${SRCDIR}/Localstuff\ ${SRCDIR}/Magdir/[a-z]* @@ -59,9 +61,4 @@ mkmagic: apprentice.c print.c ${CC} -DHAVE_CONFIG_H -DCOMPILE_ONLY \ -I${.CURDIR} -I${SRCDIR} -o ${.TARGET} ${.ALLSRC} -beforeinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${MAGICMODE} \ - magic magic.mgc ${SRCDIR}/magic.mime magic.mime.mgc \ - ${DESTDIR}${MAGICPATH} - .include diff --git a/usr.bin/gprof/Makefile b/usr.bin/gprof/Makefile index cc5a276ada97..0a0726b8c3d3 100644 --- a/usr.bin/gprof/Makefile +++ b/usr.bin/gprof/Makefile @@ -4,6 +4,8 @@ PROG= gprof SRCS= gprof.c aout.c arcs.c dfn.c elf.c lookup.c ${MACHINE_ARCH}.c hertz.c \ printgprof.c printlist.c kernel.c +FILES= gprof.flat gprof.callg +FILESDIR= ${SHAREDIR}/misc beforeinstall: ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile index 639a1503688b..48e4e305c3b6 100644 --- a/usr.bin/mail/Makefile +++ b/usr.bin/mail/Makefile @@ -6,14 +6,13 @@ SRCS= version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c edit.c fio.c \ getname.c head.c v7.local.c lex.c list.c main.c names.c popen.c \ quit.c send.c strings.c temp.c tty.c vars.c WARNS?= 0 -SFILES= mail.help mail.tildehelp +FILES= mail.help mail.tildehelp +FILESDIR= ${SHAREDIR}/misc EFILES= mail.rc LINKS= ${BINDIR}/mail ${BINDIR}/Mail MLINKS= mail.1 Mail.1 -beforeinstall: - cd ${.CURDIR}/misc; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} \ - -m 444 ${SFILES} ${DESTDIR}/usr/share/misc +.PATH: ${.CURDIR}/misc etc-mailrc: cd ${.CURDIR}/misc; ${INSTALL} -c -o root -g wheel \ diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile index 946132c7bb99..cb783ab95bb2 100644 --- a/usr.bin/units/Makefile +++ b/usr.bin/units/Makefile @@ -1,9 +1,7 @@ # $FreeBSD$ PROG= units - -beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/units.lib ${DESTDIR}/usr/share/misc +FILES= units.lib +FILESDIR= ${SHAREDIR}/misc .include diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile index 6840443d444b..f081628ea49f 100644 --- a/usr.bin/vgrind/Makefile +++ b/usr.bin/vgrind/Makefile @@ -5,6 +5,11 @@ PROG= vfontedpr SRCS= regexp.c vfontedpr.c NO_WERROR=yes SCRIPTS=vgrind.sh +FILES= vgrindefs.src vgrindefs.src.db tmac.vgrind +FILESNAME_vgrindefs.src= vgrindefs +FILESNAME_vgrindefs.src.db= vgrindefs.db +FILESDIR= ${SHAREDIR}/misc +FILESDIR_tmac.vgrind= ${SHAREDIR}/tmac MAN= vgrind.1 vgrindefs.5 BINDIR= /usr/libexec @@ -18,12 +23,4 @@ all: ${EXTRA} ${EXTRA}: ${.CURDIR}/vgrindefs.src cap_mkdb -f vgrindefs.src ${.CURDIR}/vgrindefs.src -beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/vgrindefs.src \ - ${DESTDIR}/usr/share/misc/vgrindefs - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - vgrindefs.src.db ${DESTDIR}/usr/share/misc/vgrindefs.db - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/tmac.vgrind \ - ${DESTDIR}/usr/share/tmac - .include