Files
Lexi Winter 1e629ebb15 bsd.files.mk: Fix FILESPACKAGE
Because TAGS may already have a package tag, assigning TAGS to
FILESTAGS causes the value of FILESPACKAGE to be ignored.

Only assign tags other than package, and take the default package from
${PACKAGE}, which matches the behaviour of bsd.confs.mk and bsd.man.mk.

This fixes several files that were wrongly installed in utilities,
including /usr/share/examples/sendmail/mailer.conf and some files
in /usr/share/nls.

The fix trips a bug in share/syscons where Makefile.inc was setting
FILESPACKAGE to the wrong package, but the problem was hidden because
the subdirectories set PACKAGE explicitly.  Fix this by setting the
correct FILESPACKAGE in Makefile.inc and removing the PACKAGEs.

Reviewed by:		manu
Differential Revision:	https://reviews.freebsd.org/D51784
2025-08-07 13:36:59 +01:00

34 lines
1.3 KiB
Makefile

FILES= armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \
cp437-8x8.fnt cp437-8x14.fnt cp437-8x16.fnt \
cp437-thin-8x8.fnt cp437-thin-8x16.fnt \
cp850-8x8.fnt cp850-8x14.fnt cp850-8x16.fnt \
cp850-thin-8x8.fnt cp850-thin-8x16.fnt \
cp865-8x8.fnt cp865-8x14.fnt cp865-8x16.fnt \
cp865-thin-8x8.fnt cp865-thin-8x16.fnt \
cp866-8x8.fnt cp866-8x14.fnt cp866-8x16.fnt \
cp866b-8x16.fnt cp866c-8x16.fnt \
cp866u-8x16.fnt cp866u-8x14.fnt cp866u-8x8.fnt \
cp1251-8x8.fnt cp1251-8x14.fnt cp1251-8x16.fnt \
haik8-8x8.fnt haik8-8x14.fnt haik8-8x16.fnt \
iso-8x8.fnt iso-8x14.fnt iso-8x16.fnt \
iso02-8x8.fnt iso02-8x14.fnt iso02-8x16.fnt \
iso04-8x8.fnt iso04-8x14.fnt iso04-8x16.fnt iso04-wide-8x16.fnt \
iso04-vga9-8x8.fnt iso04-vga9-8x14.fnt iso04-vga9-8x16.fnt \
iso04-vga9-wide-8x16.fnt \
iso05-8x8.fnt iso05-8x14.fnt iso05-8x16.fnt \
iso07-8x8.fnt iso07-8x14.fnt iso07-8x16.fnt \
iso08-8x8.fnt iso08-8x14.fnt iso08-8x16.fnt \
iso09-8x16.fnt \
iso15-8x8.fnt iso15-8x14.fnt iso15-8x16.fnt \
iso-thin-8x16.fnt iso15-thin-8x16.fnt \
koi8-r-8x8.fnt koi8-r-8x14.fnt koi8-r-8x16.fnt \
koi8-rb-8x16.fnt koi8-rc-8x16.fnt \
koi8-u-8x8.fnt koi8-u-8x14.fnt koi8-u-8x16.fnt \
swiss-8x16.fnt swiss-8x14.fnt swiss-8x8.fnt \
swiss-1251-8x16.fnt swiss-1131-8x16.fnt \
INDEX.fonts
FILESDIR= ${SHAREDIR}/syscons/fonts
.include <bsd.prog.mk>