diff options
27 files changed, 148 insertions, 201 deletions
diff --git a/games/fortune/datfiles/Makefile b/games/fortune/datfiles/Makefile index 4cccfb8..ad0f145 100644 --- a/games/fortune/datfiles/Makefile +++ b/games/fortune/datfiles/Makefile @@ -21,15 +21,10 @@ TYPE= real # THE FOURTH LINE: #TYPE= fake +FILES+= ${BLDS} CLEANFILES+=${BLDS} -all: ${BLDS} - -beforeinstall: - (cd ${.CURDIR} && ${INSTALL} -c -o ${SHAREOWN} -g ${SHAREGRP} \ - -m ${SHAREMODE} ${FILES} ${DESTDIR}${SHAREDIR}/games/fortune) - ${INSTALL} ${COPY} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \ - ${BLDS} ${DESTDIR}${SHAREDIR}/games/fortune +FILESDIR= ${SHAREDIR}/games/fortune .for f in fortunes fortunes2 fortunes2-o freebsd-tips limerick murphy murphy-o startrek zippy $f.dat: $f diff --git a/gnu/usr.bin/cvs/contrib/Makefile b/gnu/usr.bin/cvs/contrib/Makefile index ead7950..8cce7cd 100644 --- a/gnu/usr.bin/cvs/contrib/Makefile +++ b/gnu/usr.bin/cvs/contrib/Makefile @@ -2,7 +2,7 @@ MAINTAINER= peter@FreeBSD.org -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH: ${CVSDIR}/contrib .PATH: ${CVSDIR}/man @@ -13,8 +13,9 @@ SCRIPTS= clmerge cln_hist commit_prep cvs2vendor cvs_acls cvscheck \ FILES= README cvscheck.man cvshelp.man descend.man intro.doc -EXAMPDIR= /usr/share/examples/cvs -SCRIPTSDIR= ${EXAMPDIR}/contrib +EXAMPDIR= ${SHAREDIR}/examples/cvs +FILESDIR= ${EXAMPDIR}/contrib +SCRIPTSDIR= ${FILESDIR} PERLPATH= /usr/bin/perl CLEANFILES+= $(SCRIPTS) @@ -29,12 +30,4 @@ CLEANFILES+= $(SCRIPTS) .in: sed -e 's,@CSH@,/bin/csh,' -e 's,@PERL@,$(PERLPATH),' $< > $@ - -beforeinstall: -.for file in ${FILES} - cd ${.CURDIR} ; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ - ${CVSDIR}/contrib/${file} ${DESTDIR}${EXAMPDIR}/contrib -.endfor - .include <bsd.prog.mk> diff --git a/gnu/usr.bin/dialog/TESTS/Makefile b/gnu/usr.bin/dialog/TESTS/Makefile index 1097122..314a3ae 100644 --- a/gnu/usr.bin/dialog/TESTS/Makefile +++ b/gnu/usr.bin/dialog/TESTS/Makefile @@ -1,12 +1,8 @@ # $FreeBSD$ -FILES= README checklist ftreebox infobox inputbox menubox msgbox \ - prgbox radiolist textbox treebox yesno - -beforeinstall: -.for file in ${FILES} - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/${file} \ - ${DESTDIR}/usr/share/examples/dialog -.endfor +NOOBJ= noobj +FILES= README checklist ftreebox infobox inputbox menubox msgbox \ + prgbox radiolist textbox treebox yesno +FILESDIR= ${SHAREDIR}/examples/dialog .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/contrib/mm/Makefile b/gnu/usr.bin/groff/contrib/mm/Makefile index 3df1245..a6ed64e 100644 --- a/gnu/usr.bin/groff/contrib/mm/Makefile +++ b/gnu/usr.bin/groff/contrib/mm/Makefile @@ -3,12 +3,13 @@ SCRIPTS= mmroff.pl MAN= mmroff.7 -TMACOWN?= ${BINOWN} -TMACGRP?= ${BINGRP} -TMACMODE?= ${NOBINMODE} TMACDIR?= ${SHAREDIR}/tmac -FILES= 0.MT 5.MT 4.MT ms.cov se_ms.cov +FILES= m.tmac mse.tmac +FILESDIR_m.tmac=${TMACDIR} +FILESDIR_mse.tmac=${TMACDIR} +FILES+= 0.MT 5.MT 4.MT ms.cov se_ms.cov +FILESDIR= ${TMACDIR}/mm LOCALE= locale se_locale MAN+= groff_mm.7 groff_mmse.7 @@ -17,17 +18,13 @@ MLINKS= groff_mm.7 mm.7 groff_mmse.7 mmse.7 CLEANFILES+= ${MAN} beforeinstall: - ${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ - ${DIST_DIR}/m.tmac ${DIST_DIR}/mse.tmac ${DESTDIR}${TMACDIR} -.for file in ${FILES} - ${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ - ${DIST_DIR}/mm/${file} ${DESTDIR}${TMACDIR}/mm -.endfor .for locale in ${LOCALE} .if !exists(${locale}) || empty(${locale}) - ${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + ${INSTALL} -c -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \ /dev/null ${DESTDIR}${TMACDIR}/mm/${locale} .endif .endfor .include <bsd.prog.mk> + +.PATH: ${DIST_DIR}/mm diff --git a/gnu/usr.bin/perl/BSDPAN/BSDPAN/Makefile b/gnu/usr.bin/perl/BSDPAN/BSDPAN/Makefile new file mode 100644 index 0000000..2d54a62 --- /dev/null +++ b/gnu/usr.bin/perl/BSDPAN/BSDPAN/Makefile @@ -0,0 +1,7 @@ +# $FreeBSD$ + +NOOBJ= noobj +FILES= Override.pm +FILESDIR= ${BSDPANDIR}/BSDPAN + +.include <bsd.prog.mk> diff --git a/gnu/usr.bin/perl/BSDPAN/ExtUtils/Makefile b/gnu/usr.bin/perl/BSDPAN/ExtUtils/Makefile new file mode 100644 index 0000000..cd4dc8d --- /dev/null +++ b/gnu/usr.bin/perl/BSDPAN/ExtUtils/Makefile @@ -0,0 +1,7 @@ +# $FreeBSD$ + +NOOBJ= noobj +FILES= MM_Unix.pm Packlist.pm +FILESDIR= ${BSDPANDIR}/ExtUtils + +.include <bsd.prog.mk> diff --git a/gnu/usr.bin/perl/BSDPAN/Makefile b/gnu/usr.bin/perl/BSDPAN/Makefile index 701712f..e2a5a89 100644 --- a/gnu/usr.bin/perl/BSDPAN/Makefile +++ b/gnu/usr.bin/perl/BSDPAN/Makefile @@ -2,17 +2,14 @@ # # Doing a make install builds /usr/libdata/perl/BSDPAN -DDIR= ${DESTDIR}/usr/libdata/perl/BSDPAN +.include "Makefile.inc" -NOOBJ= noobj +NOOBJ= noobj +FILES= BSDPAN.pm Config.pm +FILESDIR= ${BSDPANDIR} -all clean cleandir depend lint tags: +clean: -FILES= BSDPAN.pm BSDPAN/Override.pm Config.pm ExtUtils/MM_Unix.pm ExtUtils/Packlist.pm - -.for file in ${FILES} -beforeinstall:: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${file} ${DDIR}/${file} -.endfor +SUBDIR= BSDPAN ExtUtils .include <bsd.prog.mk> diff --git a/gnu/usr.bin/perl/BSDPAN/Makefile.inc b/gnu/usr.bin/perl/BSDPAN/Makefile.inc new file mode 100644 index 0000000..73c8341 --- /dev/null +++ b/gnu/usr.bin/perl/BSDPAN/Makefile.inc @@ -0,0 +1,3 @@ +# $FreeBSD$ + +BSDPANDIR= ${LIBDATADIR}/perl/BSDPAN diff --git a/include/Makefile b/include/Makefile index 0db783f..f991f3f 100644 --- a/include/Makefile +++ b/include/Makefile @@ -8,7 +8,7 @@ CLEANFILES= osreldate.h version vers.c SUBDIR= rpcsvc rpc -FILES= a.out.h ar.h assert.h bitstring.h complex.h ctype.h db.h \ +HDRS= a.out.h ar.h assert.h bitstring.h complex.h ctype.h db.h \ dirent.h disktab.h \ dlfcn.h elf.h elf-hints.h err.h fnmatch.h fstab.h \ fts.h glob.h grp.h \ @@ -22,21 +22,21 @@ FILES= a.out.h ar.h assert.h bitstring.h complex.h ctype.h db.h \ string.h stringlist.h strings.h sysexits.h tar.h time.h timers.h \ ttyent.h unistd.h utime.h utmp.h vis.h wchar.h wctype.h -ARPAFILES= ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h +ARPAHDRS= ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h -PROTOFILES= dumprestore.h routed.h rwhod.h talkd.h timed.h +PROTOHDRS= dumprestore.h routed.h rwhod.h talkd.h timed.h -NETSMBFILES= nb_lib.h smb_lib.h smb_rap.h +NETSMBHDRS= nb_lib.h smb_lib.h smb_rap.h -MFILES= float.h floatingpoint.h stdarg.h varargs.h +MHDRS= float.h floatingpoint.h stdarg.h varargs.h # posix4/aio.h conflicts with dysons and isn't installed: -PFILES= mqueue.h sched.h semaphore.h # aio.h +PHDRS= mqueue.h sched.h semaphore.h # aio.h # Only for default SHARED=copies case -SFILES= soundcard.h joystick.h +SHDRS= soundcard.h joystick.h -LFILES= aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \ +LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \ termios.h ucontext.h LDIRS= cam net netatalk netatm netgraph netinet netinet6 \ @@ -80,23 +80,23 @@ beforeinstall: ${SHARED} @rm -f ${DESTDIR}/usr/include/timepps.h cd ${.CURDIR}; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${FILES} ${DESTDIR}/usr/include + ${HDRS} ${DESTDIR}/usr/include cd ${.CURDIR}/arpa; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${ARPAFILES} ${DESTDIR}/usr/include/arpa + ${ARPAHDRS} ${DESTDIR}/usr/include/arpa cd ${.CURDIR}/protocols; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${PROTOFILES} ${DESTDIR}/usr/include/protocols + ${PROTOHDRS} ${DESTDIR}/usr/include/protocols ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.OBJDIR}/osreldate.h \ ${DESTDIR}/usr/include -.for i in ${LFILES} +.for i in ${LHDRS} ln -sf sys/$i ${DESTDIR}/usr/include/$i .endfor -.for i in ${MFILES} +.for i in ${MHDRS} ln -sf machine/$i ${DESTDIR}/usr/include/$i .endfor -.for i in ${PFILES} +.for i in ${PHDRS} ln -sf posix4/$i ${DESTDIR}/usr/include/$i .endfor @@ -120,7 +120,7 @@ copies: .endif .if exists(${.CURDIR}/../sys/contrib/netsmb/include/netsmb) cd ${.CURDIR}/../sys/contrib/netsmb/include/netsmb; \ - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${NETSMBFILES} \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${NETSMBHDRS} \ ${DESTDIR}/usr/include/netsmb .endif .if exists(${.CURDIR}/../sys/security/lomac) @@ -133,7 +133,7 @@ copies: ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}/usr/include/machine .endif -.for i in ${SFILES} +.for i in ${SHDRS} ln -sf ../sys/$i ${DESTDIR}/usr/include/machine/$i .endfor diff --git a/share/dict/Makefile b/share/dict/Makefile index 399e409..9d756c7 100644 --- a/share/dict/Makefile +++ b/share/dict/Makefile @@ -1,13 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -# XXX MISSING: connectives words -FILES= README propernames web2 web2a -SYMLINKS= web2 ${BINDIR}/dict/words -NOOBJ= noobj +NOOBJ= noobj -beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} ${FILES} \ - ${DESTDIR}${BINDIR}/dict +# XXX MISSING: connectives words +FILES= README propernames web2 web2a +FILESDIR= ${BINDIR}/dict +SYMLINKS= web2 ${FILESDIR}/words .include <bsd.prog.mk> diff --git a/share/doc/IPv6/Makefile b/share/doc/IPv6/Makefile index 556fe45..4e4f34f 100644 --- a/share/doc/IPv6/Makefile +++ b/share/doc/IPv6/Makefile @@ -1,14 +1,7 @@ # $FreeBSD$ -FILES= IMPLEMENTATION - -DOCDIR = ${SHAREDIR}/doc/IPv6 - -NOMAN = noman -NOOBJ = noobj - -install: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} ${FILES} \ - ${DESTDIR}${DOCDIR} +NOOBJ= noobj +FILES= IMPLEMENTATION +FILESDIR= ${SHAREDIR}/doc/IPv6 .include <bsd.prog.mk> diff --git a/share/examples/ipfilter/Makefile b/share/examples/ipfilter/Makefile index 01a0873..5ddabd3 100644 --- a/share/examples/ipfilter/Makefile +++ b/share/examples/ipfilter/Makefile @@ -1,12 +1,12 @@ # $FreeBSD$ NOOBJ= noobj -BINDIR= /usr/share/examples FILES= README # dist sample files -DISTFILES= BASIC.NAT BASIC_1.FW BASIC_2.FW \ +.PATH: ${.CURDIR}/../../../contrib/ipfilter/rules +FILES+= BASIC.NAT BASIC_1.FW BASIC_2.FW \ example.1 example.2 example.3 example.4 example.5 \ example.6 example.7 example.8 example.9 example.10 \ example.11 example.12 example.13 example.sr firewall \ @@ -23,12 +23,6 @@ FILES+= ipf-howto.txt # http://coombs.anu.edu.au/~avalon/ sample files FILES+= examples.txt rules.txt -beforeinstall: - cd ${.CURDIR}/../../../contrib/ipfilter/rules; \ - ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \ - ${DISTFILES} ${DESTDIR}${BINDIR}/ipfilter - cd ${.CURDIR}; \ - ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \ - ${FILES} ${DESTDIR}${BINDIR}/ipfilter +FILESDIR= ${SHAREDIR}/examples/ipfilter .include <bsd.prog.mk> diff --git a/share/isdn/Makefile b/share/isdn/Makefile index 99025d8..0999d77 100644 --- a/share/isdn/Makefile +++ b/share/isdn/Makefile @@ -5,15 +5,11 @@ FILES= 0.al 1.al 2.al 3.al 4.al 5.al 6.al 7.al 8.al 9.al beep.al msg.al CLEANFILES+= ${FILES} -all: ${FILES} +.SUFFIXES: .uu -${FILES}: - uudecode < ${.CURDIR}/${.TARGET}.uu +.uu: + uudecode < ${.IMPSRC} -depend lint tags: - -install: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} ${FILES} \ - ${DESTDIR}${BINDIR}/isdn +FILESDIR= ${BINDIR}/isdn .include <bsd.prog.mk> diff --git a/share/me/Makefile b/share/me/Makefile index 5dc1b06..10f99219 100644 --- a/share/me/Makefile +++ b/share/me/Makefile @@ -7,29 +7,24 @@ MESRCS= acm.me chars.me deltext.me eqn.me float.me footnote.me \ index.me letterhead.me local.me null.me refer.me sh.me \ tbl.me thesis.me TMSRCS= tmac.orig_me -FILES= ${MESRCS} ${TMSRCS} -CLEANFILES+= ${FILES:S/$/.tmp/} +FILES= ${MESRCS:S/$/.tmp/} ${TMSRCS:S/$/.tmp/} revisions +CLEANFILES+= ${MESRCS:S/$/.tmp/} ${TMSRCS:S/$/.tmp/} # XXX use groff version # MAN= me.7 -all: ${FILES:S/$/.tmp/} - -.for file in ${FILES} +.for file in ${MESRCS} ${TMSRCS} ${file}.tmp: ${file} sed -f ${.CURDIR}/strip.sed < ${.ALLSRC} > ${.TARGET} .endfor -beforeinstall: -.for file in ${MESRCS} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ - ${file}.tmp ${DESTDIR}${MELIB}/${file} +.for file in ${MESRCS:S/$/.tmp/} revisions +FILESDIR_${file}= ${MELIB} +FILESNAME_${file}= ${file:R} .endfor -.for file in ${TMSRCS} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ - ${file}.tmp ${DESTDIR}${TMLIB}/${file} +.for file in ${TMSRCS:S/$/.tmp/} +FILESDIR_${file}= ${TMLIB} +FILESNAME_${file}= ${file:R} .endfor - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ - ${.CURDIR}/revisions ${DESTDIR}${MELIB}/ .include <bsd.prog.mk> diff --git a/share/misc/Makefile b/share/misc/Makefile index 6896666..0e1c753 100644 --- a/share/misc/Makefile +++ b/share/misc/Makefile @@ -5,11 +5,6 @@ FILES= ascii birthtoken bsd-family-tree eqnchar flowers init.ee \ iso3166 iso639 man.template mdoc.template operator pci_vendors \ scsi_modes usb_hid_usages NOOBJ= noobj - -all clean cleandir depend lint tags: - -install: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} \ - ${FILES} ${DESTDIR}${BINDIR}/misc +FILESDIR= ${BINDIR}/misc .include <bsd.prog.mk> diff --git a/share/mk/Makefile b/share/mk/Makefile index e63005c..1c17e9a 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -8,10 +8,9 @@ FILES+= bsd.port.mk bsd.port.post.mk bsd.port.pre.mk bsd.port.subdir.mk FILES+= bsd.prog.mk bsd.sgml.mk bsd.subdir.mk bsd.sys.mk FILES+= sys.mk NOOBJ= noobj +FILESDIR= ${BINDIR}/mk beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} ${FILES} \ - ${DESTDIR}${BINDIR}/mk date '+%Y%m%d' > ${DESTDIR}/var/db/port.mkversion .include <bsd.prog.mk> diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 031d470..9a7140e 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -196,6 +196,11 @@ CLEANDIRS additional directories to remove during clean and cleandir COPTS Additional flags to the compiler when creating C objects. +FILES A list of non-executable files. + The installation is controlled by the FILESNAME, FILESOWN, + FILESGRP, FILESMODE, FILESDIR variables that can be + further specialized by FILES<VAR>_<file>. + HIDEGAME If HIDEGAME is defined, the binary is installed in /usr/games/hide, and a symbolic link is created to /usr/games/dm. diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 670f5a2b..31b3855 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -67,11 +67,11 @@ MAN1= ${MAN} .endif .MAIN: all +all: objwarn ${PROG} ${SCRIPTS} ${FILES} .if !defined(NOMAN) -all: objwarn ${PROG} ${SCRIPTS} all-man _SUBDIR -.else -all: objwarn ${PROG} ${SCRIPTS} _SUBDIR +all: all-man .endif +all: _SUBDIR CLEANFILES+= ${PROG} ${OBJS} @@ -150,8 +150,8 @@ SCRIPTSDIR_${script:T}?= ${SCRIPTSDIR} SCRIPTSOWN_${script:T}?= ${SCRIPTSOWN} SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP} SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} -_scriptsinstall: SCRIPTSINS_${script:T} -SCRIPTSINS_${script:T}: ${script} +_scriptsinstall: _SCRIPTSINS_${script:T} +_SCRIPTSINS_${script:T}: ${script} ${INSTALL} ${COPY} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ ${_INSTALLFLAGS} ${.ALLSRC} \ @@ -159,6 +159,33 @@ SCRIPTSINS_${script:T}: ${script} .endfor .endif +.if defined(FILES) && !empty(FILES) +realinstall: _filesinstall + +FILESDIR?= ${BINDIR} +FILESOWN?= ${SHAREOWN} +FILESGRP?= ${SHAREGRP} +FILESMODE?= ${SHAREMODE} + +.for file in ${FILES} +.if defined(FILESNAME) +FILESNAME_${file:T}?= ${FILESNAME} +.else +FILESNAME_${file:T}?= ${file:T} +.endif +FILESDIR_${file:T}?= ${FILESDIR} +FILESOWN_${file:T}?= ${FILESOWN} +FILESGRP_${file:T}?= ${FILESGRP} +FILESMODE_${file:T}?= ${FILESMODE} +_filesinstall: _FILESINS_${file:T} +_FILESINS_${file:T}: ${file} + ${INSTALL} ${COPY} -o ${FILESOWN_${.ALLSRC:T}} \ + -g ${FILESGRP_${.ALLSRC:T}} -m ${FILESMODE_${.ALLSRC:T}} \ + ${_INSTALLFLAGS} ${.ALLSRC} \ + ${DESTDIR}${FILESDIR_${.ALLSRC:T}}/${FILESNAME_${.ALLSRC:T}} +.endfor +.endif + install: afterinstall _SUBDIR .if !defined(NOMAN) afterinstall: realinstall maninstall diff --git a/share/tabset/Makefile b/share/tabset/Makefile index 937f16b..846ef46 100644 --- a/share/tabset/Makefile +++ b/share/tabset/Makefile @@ -7,15 +7,10 @@ FILES= 3101 9837 aa aed512 beehive diablo dtc382 hp700-wy ibm3101 std \ CLEANFILES+= ${FILES} -all: ${FILES} +.SUFFIXES: .uu +.uu: + uudecode < ${.IMPSRC} -${FILES}: - uudecode < ${.CURDIR}/${.TARGET}.uu - -depend lint tags: - -install: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} ${FILES} \ - ${DESTDIR}${BINDIR}/tabset +FILESDIR= ${BINDIR}/tabset .include <bsd.prog.mk> diff --git a/share/termcap/Makefile b/share/termcap/Makefile index 07733ea..8dfff0e 100644 --- a/share/termcap/Makefile +++ b/share/termcap/Makefile @@ -7,10 +7,9 @@ # MAN= termcap.5 +FILES= map3270 termcap termcap.db +FILESDIR= ${BINDIR}/misc CLEANFILES+= termcap termcap.db -FILES= termcap termcap.db - -all: termcap termcap.db termcap: reorder termcap.src TERM=dumb ex - ${.CURDIR}/termcap.src < ${.CURDIR}/reorder @@ -18,14 +17,7 @@ termcap: reorder termcap.src termcap.db: termcap cap_mkdb termcap -beforeinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} \ - ${FILES} ${DESTDIR}${BINDIR}/misc - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} \ - ${.CURDIR}/map3270 ${DESTDIR}${BINDIR}/misc - etc-termcap: - rm -f ${DESTDIR}/etc/termcap - ln -s ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap + ln -fs ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap .include <bsd.prog.mk> diff --git a/usr.bin/ee/Makefile b/usr.bin/ee/Makefile index 699454a..cc00542 100644 --- a/usr.bin/ee/Makefile +++ b/usr.bin/ee/Makefile @@ -18,25 +18,21 @@ ENUS_LINKS = ISO8859-1 ISO8859-15 FILES= ${LANGS:S/$/.ee.cat/} CLEANFILES+= ${FILES} -all: ${FILES} - .for lang in ${LANGS} ${lang}.ee.cat: ${.CURDIR}/nls/${lang}/ee.msg gencat -new ${.TARGET} ${.ALLSRC} .endfor -beforeinstall: .for lang in ${LANGS} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ - ${lang}.ee.cat ${DESTDIR}${NLSDIR}/${lang}/ee.cat +FILESDIR_${lang:S/$/.ee.cat/}= ${NLSDIR}/${lang} +FILESNAME_${lang:S/$/.ee.cat/}= ee.cat .endfor + .for link in ${ENUS_LINKS} - ln -sf ../en_US.US-ASCII/ee.cat \ - ${DESTDIR}${NLSDIR}/en_US.${link}/ee.cat +SYMLINKS+= ../en_US.US-ASCII/ee.cat ${NLSDIR}/en_US.${link}/ee.cat .endfor .for link in ${8859_15_LINKS} - ln -sf ../${link}.ISO8859-1/ee.cat \ - ${DESTDIR}${NLSDIR}/${link}.ISO8859-15/ee.cat +SYMLINKS+= ../${link}.ISO8859-1/ee.cat ${NLSDIR}/${link}.ISO8859-15/ee.cat .endfor .include <bsd.prog.mk> diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile index b0ac4d0..f97c6c9 100644 --- a/usr.sbin/named/Makefile +++ b/usr.sbin/named/Makefile @@ -32,19 +32,15 @@ HTMLS= acl.html address_list.html comments.html config.html controls.html \ docdef.html example.html include.html index.html key.html \ logging.html master.html options.html server.html trusted-keys.html \ zone.html -FILES= DynamicUpdate FAQ.1of2 FAQ.2of2 style.txt +MISCS= DynamicUpdate FAQ.1of2 FAQ.2of2 style.txt +FILES= ${HTMLS} ${MISCS} +.PATH: ${BIND_DIR}/doc/html ${BIND_DIR}/doc/misc - -beforeinstall: .for file in ${HTMLS} - cd ${BIND_DIR}/doc/html ; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${file} \ - ${DESTDIR}${DOCDIR}/html +FILESDIR_${file}= ${DOCDIR}/html .endfor -.for file in ${FILES} - cd ${BIND_DIR}/doc/misc ; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${file} \ - ${DESTDIR}${DOCDIR}/misc +.for file in ${MISCS} +FILESDIR_${file}= ${DOCDIR}/misc .endfor .include <bsd.prog.mk> diff --git a/usr.sbin/pcvt/Misc/Doc/Makefile b/usr.sbin/pcvt/Misc/Doc/Makefile index fcd2a9c..a6d9660 100644 --- a/usr.sbin/pcvt/Misc/Doc/Makefile +++ b/usr.sbin/pcvt/Misc/Doc/Makefile @@ -1,17 +1,9 @@ # $FreeBSD$ +NOOBJ= noobj FILES= Acknowledgements Bibliography CharGen \ Charsets EscapeSequences Keyboard.HP Keyboard.VT \ NotesAndHints +FILESDIR= ${BINDIR}/Doc -beforeinstall: - for file in ${FILES}; \ - do \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/$$file ${DESTDIR}${BINDIR}/Doc/$$file ; \ - done - -afterdistribute: beforeinstall - -.include "../Makefile.inc" -.include <bsd.subdir.mk> +.include <bsd.prog.mk> diff --git a/usr.sbin/pcvt/Misc/Etc/Makefile b/usr.sbin/pcvt/Misc/Etc/Makefile index 60b506d..5e1aac5 100644 --- a/usr.sbin/pcvt/Misc/Etc/Makefile +++ b/usr.sbin/pcvt/Misc/Etc/Makefile @@ -1,13 +1,7 @@ # $FreeBSD$ +NOOBJ= noobj FILES= Termcap Terminfo pcvt.el xmodmap-german pcvt.sh - -NOOBJ= - -beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${FILES} \ - ${DESTDIR}${BINDIR}/Etc - -afterdistribute: beforeinstall +FILESDIR= ${BINDIR}/Etc .include <bsd.prog.mk> diff --git a/usr.sbin/pcvt/Misc/Makefile b/usr.sbin/pcvt/Misc/Makefile index a512eaa..6eff974 100644 --- a/usr.sbin/pcvt/Misc/Makefile +++ b/usr.sbin/pcvt/Misc/Makefile @@ -1,17 +1,8 @@ # $FreeBSD$ -SUBDIR= Doc Etc - +NOOBJ= noobj FILES= README.FIRST - -beforeinstall: - for file in ${FILES}; \ - do \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/$$file ${DESTDIR}${BINDIR}/$$file ; \ - done - -afterdistribute: beforeinstall +SUBDIR= Doc Etc .include "Makefile.inc" -.include <bsd.subdir.mk> +.include <bsd.prog.mk> diff --git a/usr.sbin/pcvt/Misc/Makefile.inc b/usr.sbin/pcvt/Misc/Makefile.inc index c7ce5f2..c7a2ebc 100644 --- a/usr.sbin/pcvt/Misc/Makefile.inc +++ b/usr.sbin/pcvt/Misc/Makefile.inc @@ -1,5 +1,4 @@ # $FreeBSD$ DISTRIBUTION= doc -BINDIR= /usr/share/pcvt -BINMODE= 0444 +BINDIR= ${SHAREDIR}/pcvt diff --git a/usr.sbin/stallion/bootcode/Makefile b/usr.sbin/stallion/bootcode/Makefile index 759962a..febb8e2 100644 --- a/usr.sbin/stallion/bootcode/Makefile +++ b/usr.sbin/stallion/bootcode/Makefile @@ -6,16 +6,11 @@ uudecode ${.IMPSRC} FILES= 2681.sys cdk.sys +FILESDIR= ${BOOTDIR} CLEANFILES= ${FILES} MAN= stl.4 MLINKS= stl.4 stli.4 MANSUBDIR=/i386 -all: $(FILES) - -beforeinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ - ${FILES} ${DESTDIR}${BOOTDIR} - .include <bsd.prog.mk> |
