Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Update date for r236338 & r236346.

Add "-V '${VAR}'" variable expansion from Portable Berkeley Make.

Submitted by: Simon Gerraty <sjg@juniper.net>

Deprecate the FreeBSD make's ":U" (to-upper case) and ":L" (to-lower case)
modifiers for ":tu" and ":tl" from OSF's ODE, which made its way into
NetBSD's make, which is the source for the Portable Berkeley Make.

Submitted by: Simon Gerraty <sjg@juniper.net>

Minor mdoc nits.

make(1): obj dirs are physical paths so write `pwd -P` rather than `pwd`.

Regular pwd may return a pathname containing symlinks, but make does not use
such pathnames.

- Missing full stops
- Upper case the first character of an description
- Section headings do not need to be quoted. From OpenBSD's make.1, revision 1.81
- Plural of suffix is suffixes. From OpenBSD's make.1, revision 1.61
- s/seperating/separating/

PR: 135165
Submitted by: Alan R. S. Bueno <alan.bsd@gmail.com>
MFC after: 1 week

Eliminated nits from last commit.

OK'ed by: rodrigc

Partial merge of man page cleanups from NetBSD:

revision 1.91
Fri Nov 7 01:01:46 2003 UTC by lukem

Add some subsections in the VARIABLE ASSIGNMENTS section.

In the "modifier description" list, show each modifier with the leading `:'.
Rationale: it's hard to search for modifiers without it, and we already do
the same thing in the -options and .makecommands lists. I now find it much
easier to find the description for a modifier in the man page.

Obtained from: NetBSD

Add ability to search up the directory hierarchy for the system directory.
Do by specifying ".../" with '-m' or MAKESYSPATH (new) environment variable.

Reviewed by: <sjg@NetBSD.org>
Obtained from: NetBSD (+ embellishment by me, sent back to NetBSD)

Avoid infinite loops when remaking makefiles not only
for Makefile targets but also for targets they depend on.

+ Add the -Q be-quiet flag for parallel jobs.
- Enable -Q by default for the moment - there is something weird
going on in the rescue build.

1. Add the ability to tweak the token output before targets in job mode.
E.g., .MAKE.JOB.PREFIX=${.newline}---[${.MAKE.PID}]
would produce

---[1234] target ---

2. Added ${.newline} as a simple means of being able to include '\n' in the
assignment of .MAKE.JOB.PREFIX

Obtained from: NetBSD

Fix up after last commit:

Bump doc date;
Kill hard sentence breaks;
Fix commas by moving them off their own line.

Clarify the behaviour of conditionals when dealing with comparisons.
In particular, point out that string comparison can only use != and ==
(how weird, given that the underlying call to strcmp returns more
information), that floating point values are correctly interpreted
as numbers, and that the left-hand side must be a variable expansion.

MFC after: 3 weeks

Add POSIX -p flag to make(1).

This article [1] describes the -p flag for make(1):

Write to standard output the complete set of macro definitions and
target descriptions. The output format is unspecified.

We already support a similar flag (-d g1), but unlike -p, it still
executes commands. Our implementation just turns it into -d g1, but also
sets flag `printGraphOnly', which will cause make(1) to skip execution.

[1] http://www.opengroup.org/onlinepubs/009695399/utilities/make.html

Reviewed by: imp
PR: standards/99960

Note that the .POSIX special target disables the "Remaking Makefiles" feature.

Fix bugs in the previous revision.

If the special target .MAKEFILEDEPS exists, then enable the
"remaking makefiles" feature. Otherwise, follow traditional Pmake behavior.
(hash table will be regenerated and committed follow this commit)

Don't forget to set MAKEFLAGS in the childs' environment
from the .MAKEFLAGS global variable even if it's empty or
unset. This means setting MAKEFLAGS to just an empty string
in the latter case.

If not doing so, make(1) behaved inconsistently WRT MAKEFLAGS.
In particular, it would let a `-f foo' option down to sub-makes
if .MAKEFLAGS was unset. E.g.,

env MAKEFLAGS="-f mymakefile" make

would pass `-f mymakefile' down to sub-makes via their environment
(unless mymakefile added something to .MAKEFLAGS).
But any additional options appearing would change this behaviour to
not passing `-f mymakefile' to sub-makes, as in:

env MAKEFLAGS="-f mymakefile" make -D DUMMY

or

env MAKEFLAGS="-f mymakefile -D DUMMY" make

(unless mymakefile cleared .MAKEFLAGS).

Also make(1) would leave MAKEFLAGS at its initial value if the
makefile set .MAKEFLAGS to an empty value. I.e., it was impossible
to override MAKEFLAGS with an empty value. (Note well that makefiles
are not to touch MAKEFLAGS directly, they alter .MAKEFLAGS instead.
So make(1) can filter out things such as -f when copying MAKEFLAGS
to .MAKEFLAGS at startup. Direct modifications to MAKEFLAGS just go
nowhere.)

While the original intentions of the BSD make authors are somewhat
unclear here, the bug proves that NOT passing -f options down is
the settled behaviour because the opposite behaviour is totally
unreliable in the presence of any other options. In addition, not
passing down -f's found in the environment is consistent with doing
so WRT the command line.

Update the manpage accordingly and make the whole description of
MAKEFLAGS and .MAKEFLAGS more consistent as this change indeed
brings more consistency into the reliable behaviour of make(1).

Submitted by: ru (main.c)
Tested with: make world

Move a stray paragraph on .Ev MAKEFLAGS to where it belongs.

Revise the description of how .Ev MAKEFILE and .Va .MAKEFILE relate.
The most important point is that -f option(s) are never copied from
.Ev MAKEFILE to .Va .MAKEFILE by make(1), which is consistent with
handling the command line. (-f silently sit in .Ev MAKEFILE and go
to make's children unless overwritten via .Va .MAKEFILE)

Bump .Dd.

Split descriptions of .Ev MAKEFILE and .Va .MAKEFLAGS for clarity.

Give more details on the following topics:
o How global, command-line, and environment variables relate.
o What peculiarities the -f option has WRT ${MAKEFLAGS}.

Better English.

Implement "Remaking Makefiles" feature:

After reading Makefile and all the files that are included using .include
or .sinclude directives (source Makefiles) make considers each source
Makefile as a target and tries to rebuild it. Both explicit and implicit
rules are checked and all source Makefiles are updated if necessary. If
any of the source Makefiles were rebuilt, make restarts from clean state.

To prevent infinite loops the following source Makefile targets are
ignored:
- :: targets that have no prerequisites but have commands
- ! targets
- targets that have .PHONY or .EXEC attributes
- targets without prerequisites and without commands

When remaking a source Makefile options -t (touch target), -q (query
mode), and -n (no exec) do not take effect, unless source Makefile is
specified explicitly as a target in make command line.
Additionally, system makefiles and .depend are not considered as a
Makefiles that can be rebuilt.

Reviewed by: harti

o Grammar: is appears -> appears.

PR: docs/107306
Submitted by: Tomas Mozes
MFC after: 1 week

Fix a group of typos:
preceed -> precede,
preceeded -> preceded,
preceeding -> preceding.

Submitted by: Andre Guibert de Bruet <andy@siliconlandmark.com>

Markup nit.

Markup fixes.

Add :u var modifier (remove adjacent duplicate words like uniq(1).

Reviewed by: harti
Obtained from: NetBSD (mostly)

Revise the manpage to a certain extent, mostly with respect to
make's processing of top-level and included makefiles. Point
out at make.conf(5) and __MAKE_CONF when telling about sys.mk.

Reviewed by: ru

__MAKE_CONF doesn't really belong here because it is
a FreeBSD extension of sys.mk. A xref to make.conf(5)
will be enough here.

Requested by: ru

Clarify the usage and effects of sys.mk, make.conf(5), and __MAKE_CONF.

MFC after: 2 weeks

Remove redundant `\&' escapes.

Fixup previous commit.

Add a .sinclude directive which does the exact same as .include, except
whine when the file cannot be found and opened.

Fix all the spelling mistakes I could find in the man pages for words
that have at least 3 characters.

MFC after: 1 week
Thanks to: Music band ``Chingon''
for keeping me company while searching for these.

Markup and wording fixes.

Approved by: re (blanket)

Another shell attribute 'unsetenv' that will cause to unsetenv("ENV")
before executing the shell. Until now this was done when the default
shell was the ksh. This failed if the default shell was sh or csh and
the user switched to ksh.

Describe the meta and builtins attributes for the .SHELL special
target.

Describe the -x option and the .WARN pseudo-target.

Document the new -A flag for ignoring archive errors.

Expand *n't contractions.

Fix quoting of the MAKEFLAGS environment variable by only quoting spaces
and tabs. This is still not correct for command line variable values
ending in a backslash because this would require a larger effort.
Document this limitation in the BUGS section of the man page. The
quoting is mostly compatible with that of gmake and smake.

Tested by: Max Okumoto and Joerg Sonnenberger from DragonFly BSD
Reviewed by: ru (man page, partly)

Sort sections.

Scheduled mdoc(7) sweep.

Describe the .SHELL target.

Reviewed by: ru

Document the effects of modifying the .MAKEFLAGS internal
variable and using the .MAKEFLAGS special target, and the
differences between them.

Reviewed by: harti

Make explicit that MAKEOBJDIRPREFIX and MAKOBJDIR must be set
as environment variables and should not be set on make's command
line. They happen to work accidentially as command line variables
too when none of the sub-makes wants to play games with them (because
make is putting command line variables into the environment and will
find them there later on). Makefile.inc1 wants to change
MAKEOBJDIRPREFIX. In this case one cannot set it on the command line.

Correct the .Dd date. Pluralize 'assignment' in one place.

Requested by: ru

Correct the description of the MFLAGS and .MAKEFLAGS variables. Add
the MFLAGS target. Document that variable assignments from the MAKEFLAGS
environment variable and the .MAKEFLAGS and .MFLAGS target have the
same precedence as command line variable assignments.

Bump the date in .Dd for the recent '+' flag commit.

Requested by: ru

Implement POSIX's '+' flag for command lines. This flag causes a line
to be executed even when -n is given on the command line to make. This is
very handy for calls to submakes.

This is slightly changed from the original patch as obtained from NetBSD.
The NetBSD variant prints lines which have both '+' and '@' when -n
is specified. The commited version always obeys '@'.

Bump MAKE_VERSION so Makefiles can use this conditionally.

PR: standards/66357 (partly)
Submitted by: Mark Baushke <mdb@juniper.net>
Obtained from: NetBSD

Make it clearer what means 'won't work' for .if string == ${VAR}.

Replace the use of '=' in conditionals in the examples
by the more correct '=='.

Clarify the example explaining that .for expansion takes place before
.if handling by showing the correct code instead of saying 'the other
way around'. Change a variable name there so the example is more parseable
to the human reader.

PR: docs/65400
Submitted by: Roman Neuhauser <neuhauser@chello.cz>

Remove the dependency of the :C/regexp/replacement/ variable modifier
from the :S modifier which follows a bit further below. This way the
reader can read each of these two descriptions without having to jump
back and forth in the manpage.

PR: docs/26943
Submitted by: Alex Kapranoff <alex@kapran.bitmcnit.bryansk.su>

Mechanically kill hard sentence breaks.

manlint

Obtained from: ru

New variable `.MAKEFILE_LIST', useful for tracing, debugging and dependency tracking.

Use
make -V .MAKEFILE_LIST | tr \ \\n | awk '$0==".." {l--; next} {l++; printf "%*s%s\n", l, " ", $0}'
to print a tree of all included makefiles.

Approved by: joerg
MFC after: 1 week

Markup nits.

Document the new .warning directive.

Revert previous commit, ru has ideas how to better document this
elsewhere.

Document __MAKE_CONF and its default, /etc/make.conf.

MFC-After: 2 weeks

Document the recently added `O' modifier.

- Cut out the code that caches the "." directory out of Dir_Init()
into a separate function, Dir_InitDot().

- Postpone the current and object directories detection (and caching
of the "." directory) until after all command line arguments are
parsed. This makes the -C option DTRT.

PR: bin/47149

Fixed the abuses of .Ql visible on stderr in troff mode.

PR: docs/37176

Document the confusing behavior that the .if conditional defaults
to defined(), e.g., ``.if 1'' is equivalent to ``.if defined(1)'',
which is only true when the ${1} variable is defined.

Mention that the left-hand side of the comparison
conditional must always be a variable expansion.

Obtained from: PMake

Do not lie that debugging .for loops is a no-op.

Document the parsing bug.

Make it clear that the ":C" variable modifier expects an extended
regular expression instead of an obsolete regular expression.
Also, cross-reference re_format(7) instead of regex(3).

MFC after: 3 days

Add a -C ala GNU make(1) for Makefiles which are too lazy to use $(MAKE) and
this particular GNU flag. It changes into the given directory for the
operation in question. This just goes into said directory at the time of
parsing the argument for getopt(3).

Submitted by: Rachel Hestilow <rachel@jerkcity.com>

make(I) appeared in PWB UNIX.

mdoc(7) police: removed unnecessary .Ns's.

Use `The .Nm utility'

Move the sysV variable substitution up with the BSD feature that replaced it.

Prefer BSDmakefile over makefile and Makefile.

Submitted by: jmallett
Obtained from: OpenBSD

Fix copyrights, and undo SCS ID damage.

Un.Ar makefile. The add of .Ar was part of my last commit.
Asked by: ru

Reorder #include. Cast arg #2 of lseek to an off_t when constant. No need to
test if failsafe memory allocation fails, it can't. perror -> warn. Use
failsafe memory allocation provided.

Use .Pa and .Ar. Uppercase (first letter) programname after dot.

mdoc(7) police: protect trailing full stops of abbreviations
with a trailing zero-width space: `e.g.\&'.

Clarify that MAKEOBJDIR and MAKEOBJDIRPREFIX are environment variables.

Submitted by: bde

Remove whitespace at EOL.

Note that sys.mk is read before any other file (even Makefile)

mdoc(7) police: remove hard sentence breaks.

unifdef -UWANT_ENV_PWD.

No one ever going to use this bugfeature.

Preceed/preceeding are not english words. Use precede and preceding.

Uname is in section 3 of the manual pages.

PR: 25008
Submitted by: fullermd@over-yonder.net

mdoc(7) police: split punctuation characters + misc fixes.

Prepare for mdoc(7)NG.

Prepare for mdoc(7)NG.

Xref make.conf(5), and point to /usr/share/doc/psd/12.make for the
tutorial paper.

mdoc(7) police: use the new features of the Nm macro.

Add :L and :U variable modifiers. These convert the variable's value to
all-lower or all-upper case characters, respectively. These were added
to further reduce differences between NetBSD/OpenBSD and FreeBSD make(1)
to propagate OpenPackages.

PR: 19959
Submitted by: Gaspar Chilingarav <nm@web.am>

Add :C/// variable modifier, which is similar to :S/// in functionality
but allows for regex. I removed NO_REGEX since no one could give a reason
to have it, and since we don't use make in bootstrap tools, it's not needed.

This is mostly added to synch up with NetBSD/OpenBSD so as to eliminate
roadblocks in the OpenPackages project (see http://www.openpackages.org/).
It's also quite useful, and costs us only about 3 kilobytes of space.

PR: 21605
Submitted by: Hubert Feyrer <hubertf@NetBSD.org>
Reviewed by: silence on -arch
Obtained from: NetBSD

Previous commit was to add an -X switch to disable recursive expansion with
-V.

PR: bin/17188
Submitted by: Mark Valentine <mark@thuvia.demon.co.uk>

*** empty log message ***

Use pwd instead of cwd in backticks. cwd in backticks doesn't do
anything useful in a Bourne shell.

PR: 19980
Submitted by: Alex Kapranoff <alex@kapran.bitmcnit.bryansk.su>

Update make(1) manpage to include information about the new loud
debugging facility I introduced earlier today.

Remove single-space hard sentence breaks. These degrade the quality
of the typeset output, tend to make diffs harder to read and provide
bad examples for new-comers to mdoc.

Fix errors in .Xr usage.

PR: docs/17057
Submitted by: Submitted by: Udo Erdelhoff <ue@nathan.ruhr.de>

${.MAKE} -> ${MAKE}

Reviewed by: hoek

Make '||' visible.

PR: docs/15265
Submitted by: Kazu TAKAMUNE <takamune@avrl.mei.co.jp>

s/with historical makefils//. Also, relocate and change the description
of VPATH to be a little sexier. I'd say it looks a bit like Claudia
Schiffer now, which I consider a definate improvement. We're also a little
more subtle about saying that VPATH is for backward(s) compatibility.

Submitted-by: chris, bde, and myself
[although none of their descriptions were as sexy
M(|is|r)s Schiffer, of course].

$Id$ -> $FreeBSD$

Merge style- and trivial- only changes from OpenBSD (dated 1999/07/29-19:55+1).

Obtained from: OpenBSD, sometimes indirected from NetBSD; myself

Bad reference of getcwd(2) changed to getcwd(3).

Make VPATH explanation more concise. I apparently was not thinking
on the previous commit.

Move ${VPATH} explanation under the .PATH rule section.

Clarify my vague explanation of how ${VPATH} works and why it shouldn't
be used.

Document ${VPATH} and that it _should_not_ be used in any new Makefiles.

PR: 10556
Submitted by: Dominic Mitchell <Dom.Mitchell@palmerharvey.co.uk>

Add a -E flag, similar to -e (overide variables from environment) except
that -E only operates for a specified variable. Useful since the -e option
will often pull-in many unwanted variable overrides (esp. in a make world
situation). Uses include overriding BINOWN (which cannot be done by normal
methods or through abuses of MAKEFLAGS) or likely for ports to honour CFLAGS
(provided they're running on a system whose make(1) has this option).

Add :Q to quote variable expansion to all proper expansion of
variables for recursive makes. This makes it less painful to cross
build recent NetBSD kernels on FreeBSD.

Obtained from: NetBSD

Described the search path Make uses to find makefiles.

Fixed bugs in previous commit:
- missing `v' in synopsis.
- 'v' disordered relative to 'V' in description of options.
- line too long in description of 'v'.

Added a -v (verbose) option and hid multi-job file banner generation
behind it.

Only process the ``PWD'' environmental var if built with "WANT_ENV_PWD"
defined. Bash v2 sets PWD and it creates major problems for those of us
with /usr/src being a symlink. See the lists for examples of the problems.

Add a graceful jumping off point with a new .error directive.

PR: 6720
Submitted by: Niall Smart <njs3@doc.ic.ac.uk>

Use err(3). Cosmetic in usage string.

Add reference to `PMake - A Tutorial'

Add enviroment variable MAKEOBJDIRPREFIX, still undocumented except
in bsd.obj.mk.

Revert $FreeBSD$ to $Id$

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Merge in NetBSD's changes to make(1). Changes include:

- Add the .PHONY, .PARALLEL, and .WAIT directives
- Added the -B and -m commandline flags
- misc. man page cleanups
- numerous job-related enhancements
- removed unused header file (bit.h)
- add util.c for functions not found in other envs.
- and a few coordinated whitespace changes

Special thanks to Christos Zoulas <christos@netbsd.org>
for help in the merge. A 'diff -ur' between Net and
FreeBSD now only contains sccsid-related diffs. :)

Obtained from: NetBSD, christos@netbsd.org, and me

delete doubled words, e.g.: "the the" -> "the"

Listed all the environment variables (MACHINE and PWD were missing).
Documented PWD. MACHINE and MAKEOBJDIR are are still undocumented
except in main.c. I will be changing MAKEOBJDIR back to its old
behaviour so that the comment in main.c actually applies.

Removed irrelevant misformatted text about make's name being argv[0].

Added a -V option to print make's idea of the value of a variable.

Submitted by: mark@linus.demon.co.uk (Mark Valentine)

Fixed bugs and inconsistencies in synopsis and usage message.

Fix a typo.

Submitted by: tgm@netcom.com (Thomas G. McWilliams)

This commit was generated by cvs2svn to compensate for changes in r1590,
which included commits to RCS files with non-trunk default branches.

BSD 4.4 Lite Usr.bin Sources