Commit Graph

53 Commits

Author SHA1 Message Date
christos f0762ecc01 Include bsd.sys.mk so that HOST_SH is defined. (Hi apb) 2006-10-22 22:22:39 +00:00
peter e263dfd62f WFORMAT is no more... 2006-10-08 17:52:28 +00:00
apb 9eda896a8f Use ${HOST_SH}, not just sh, in the shell command to set MAGDIRF. 2006-09-29 20:20:47 +00:00
jmc 55082c81c2 Force LANG=C before doing the shell glob to avoid collation issues on hosts
(otherwise it might pick up CVS for instance)
2004-06-16 01:33:35 +00:00
lukem 130ab7336b Rework how MAKEVERBOSE operates:
*	Don't bother prefixing commands with a line of  ${_MKCMD}\
	and instead rely upon "make -s".  This is less intrusive on
	all the Makefiles than the former.  Idea from David Laight.

    *	Rename the variables use to print messages.  The scheme now is:
	    _MKMSG_FOO		Run  _MKMSG 'foo'
	    _MKTARGET_FOO	Run  _MKMSG_FOO ${.TARGET}
	From discussion with Alistair Crooks.
2003-10-21 10:01:19 +00:00
lukem c545cc169d support MAKEVERBOSE 2003-10-19 04:30:30 +00:00
itojun 8acd0a2534 have DPADD 2003-09-17 00:41:17 +00:00
lukem 001c68bd94 Rename a large chunk of the make(1) variables which refer to a
program/tool from "FOO" to "TOOL_FOO".  The new variables are:
	TOOL_ASN1_COMPILE  TOOL_CAP_MKDB  TOOL_CAT  TOOL_CKSUM  TOOL_COMPILE_ET
	TOOL_CONFIG  TOOL_CRUNCHGEN  TOOL_CTAGS  TOOL_DB  TOOL_EQN  TOOL_FGEN
	TOOL_GENCAT  TOOL_GROFF  TOOL_HEXDUMP  TOOL_INDXBIB  TOOL_INSTALLBOOT
	TOOL_INSTALL_INFO  TOOL_M4  TOOL_MAKEFS  TOOL_MAKEINFO  TOOL_MAKEWHATIS
	TOOL_MDSETIMAGE  TOOL_MENUC  TOOL_MKCSMAPPER  TOOL_MKESDB
	TOOL_MKLOCALE  TOOL_MKMAGIC  TOOL_MKTEMP  TOOL_MSGC  TOOL_MTREE
	TOOL_PAX  TOOL_PIC  TOOL_PREPMKBOOTIMAGE  TOOL_PWD_MKDB  TOOL_REFER
	TOOL_ROFF_ASCII  TOOL_ROFF_DVI  TOOL_ROFF_HTML  TOOL_ROFF_PS
	TOOL_ROFF_RAW  TOOL_RPCGEN  TOOL_SOELIM  TOOL_SUNLABEL  TOOL_TBL
	TOOL_UUDECODE  TOOL_VGRIND  TOOL_ZIC

For each, provide default in <bsd.sys.mk> of the form:
	TOOL_FOO?=	foo
and for the ${USETOOLS}=="yes" case in <bsd.own.mk>, provide override:
	TOOL_FOO=	${TOOLDIR}/bin/${_TOOL_PREFIX}foo

Document all of these in bsd.README.

This cleans up a chunk of potential (and actual) namespace collision
within our build infrastructure, as well as improves consistency in
the share/mk documentation and provision of appropriate defaults for
each of these variables.
2003-07-10 10:33:58 +00:00
pooka 241a9c6d03 Adapt to new magic compilation behaviour: copy magic.mime to objdir
before compiling it so that we get the output also in the objdir instead
of the distdir
2003-05-26 13:42:33 +00:00
tsutsui 04568b646b Link libz after libmagic otherwise it fails on NOPIC ports. 2003-04-12 02:15:22 +00:00
pooka b70c4e8541 use ${CAT} instead of cat 2003-04-05 12:30:51 +00:00
pooka 92cfb1b295 When not using TOOLS, compile magic using the newly-built binary
as suggested by Ken Wellsch in bin/20996
2003-04-05 11:33:16 +00:00
pooka 82e0198241 use file from dist 2003-03-26 00:05:02 +00:00
pooka fbf022381d add zlib 2002-05-18 07:04:38 +00:00
thorpej d70c41a1fb Fix the magic.mime problem correctly: the input file gets a different
name.
2002-03-24 22:12:59 +00:00
wiz c41c892893 Undo last.
If no objdir exists, this change made 'make clean' remove the checked out
magic.mime, making subsequent 'make build's fail.
2002-03-24 17:16:22 +00:00
veego 8bb9a08931 Add magic.mime to CLEANFILES. 2002-03-21 22:02:06 +00:00
thorpej fe9b2e2bd7 No need to reference .OBJDIR here. 2002-03-05 22:07:13 +00:00
christos 9220b490d0 Install magic.mime.mgc too. 2001-10-10 16:56:27 +00:00
kleink 042e6a7b90 Make this really work with MKSHARE=no. 2001-05-29 20:22:05 +00:00
simonb 655e90b8b9 Make this cross-compile friendly - build a cut down program called
"mkmagic" out of apprentice.c and print.c that is built using the
host compiler and used to generate magic.mgc.
2001-05-09 14:05:52 +00:00
simonb afaa61c23a Use curly braces instead of parentheses around make(1) variables. 2001-05-09 13:58:25 +00:00
fvdl 947211629a magic.mgc needs ${PROG} to be created, so add a depenency. Makes
parallel make work.
2001-05-02 18:35:41 +00:00
enami 2323af4522 Have an indivisual rule to build magic.mgc. 2001-03-31 01:31:49 +00:00
pooka b7aff9e185 run file from ${.OBJDIR} instead of ${.CURDIR} to make it work with
objdir builds also
2001-03-27 08:45:02 +00:00
pooka 2ace2c7db3 Missed magic.mgc from list of files to wipe out 2001-03-27 00:53:43 +00:00
pooka 27ed415ae8 switch to use new compressed magic file: magic.mgc 2001-03-27 00:48:59 +00:00
is 135600f947 More format string cleanup by sommerfeld. 2000-10-11 14:46:00 +00:00
pooka e5efd07a0b resolve conflicts 2000-09-22 16:34:59 +00:00
christos 5d9fa0390d Resolve conflicts 2000-05-14 22:53:37 +00:00
mycroft 5cc7cec6d9 More .mk file fallout. 2000-01-23 18:00:38 +00:00
christos 7d48644528 Resolve corn flakes. 1999-11-01 17:39:26 +00:00
he 392f839e3f Prevent `file' from trying to use the (directory!) /usr/share/misc as the
magic file database.
1999-02-16 12:32:52 +00:00
lukem a4547242e3 use MFILESDIR instead of FILESDIR. fixes problems some people are having 1999-02-16 07:11:27 +00:00
lukem dcab0210a0 convert from NOxxx= to MKxxx=no.
include <bsd.own.mk> if testing a MKxxx variable.
1999-02-13 02:54:17 +00:00
lukem 9dee5d2b46 don't install in /usr/share if NOSHARE is defined 1998-09-27 17:22:03 +00:00
christos f46e623e45 Turn on ELF and other NetBSD features. 1998-09-20 15:36:46 +00:00
christos faf55c153e resolve corn flakes. 1998-09-20 15:27:15 +00:00
lukem 8ba07ab0b3 use CPPFLAGS instead of CFLAGS 1997-10-24 09:00:17 +00:00
is 5379dca61e /etc/magic -> /usr/share/misc/magic 1997-09-30 17:00:30 +00:00
mjacob 9c69077919 Macro expansion of shell metacharacters did not occur for me. I made
a :sh variable to get the list of magic files instead.
1997-05-17 21:15:35 +00:00
mikel 8e4e532ceb include magdir/386bsd in MAGFILES; from Alan Barrett in PR misc/3422. 1997-04-03 07:17:24 +00:00
christos 3917c3179d - Makefile cleanups 1997-03-24 21:57:01 +00:00
christos 704854c465 Update to version 3.22 1997-01-28 00:49:36 +00:00
tls 9d225a1783 RCS ID police 1997-01-09 20:18:21 +00:00
thorpej 150c33e60b Use ${INSTALL}. 1996-10-18 05:55:26 +00:00
christos 1b1e1884b3 Changes from file-3.21 1996-10-05 20:20:24 +00:00
cgd 7bcf9338df specify man pages the new way. 1994-12-22 12:29:38 +00:00
cgd ab60a0b473 include the NetBSD magic file seperately. call it 'NetBSD' rather
than 'netbsd'.  cvs tree magic by cgd will move it to the right place.
1993-11-03 05:56:58 +00:00
mycroft aee4b07b8a Add RCS identifiers, remove some completely useless RCS logs and patchkit
headers, and a few other insignificant changes.
1993-08-02 17:48:44 +00:00