diff options
| author | rwatson <rwatson@FreeBSD.org> | 2006-02-04 18:24:06 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2006-02-04 18:24:06 +0000 |
| commit | f7eaf7f2fdc7c06f9d09b4138b8d58e312649bef (patch) | |
| tree | 0a9642590f0f587fd03439aece453ebb6653c09e /usr.sbin/mergemaster/mergemaster.8 | |
| parent | 9e3a00153228ade18dd16caad96810c85df7fd80 (diff) | |
| download | FreeBSD-src-f7eaf7f2fdc7c06f9d09b4138b8d58e312649bef.zip FreeBSD-src-f7eaf7f2fdc7c06f9d09b4138b8d58e312649bef.tar.gz | |
Add a -A argument to mergemaster to allow explicitly specifying an
architecture to pass through to the underlying makefiles. This is
quite useful when building on an i386 box to populate an amd64 NFS
root.
Head nod: dougb
MFC after: 1 week
Diffstat (limited to 'usr.sbin/mergemaster/mergemaster.8')
| -rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 646fbd9..898430c 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 5, 2001 +.Dd February 4, 2006 .Dt MERGEMASTER 8 .Os .Sh NAME @@ -38,6 +38,7 @@ .Op Fl d .Op Fl u Ar N .Op Fl w Ar N +.Op Fl A Ar architecture .Op Fl D Ar /path .Sh DESCRIPTION The @@ -235,6 +236,10 @@ Supply an alternate screen width to the .Xr sdiff 1 command in numbers of columns. The default is 80. +.It Fl A Ar architecture +Specify an alternative +.Ev TARGET_ARCH +architecture name. .It Fl D Ar /path Specify the destination directory for the installed files. .El |
