diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-06-26 18:32:36 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-06-26 18:32:36 +0000 |
| commit | 8aef19f7563fa7e20f072f46202468eb3bda3868 (patch) | |
| tree | cd9a1b1f0d83a83bdf98e50ab1418774cce610ed /usr/src/tools/quick/make-zfs | |
| parent | f4df7cccbc6a219c58b697781910766c28800dd9 (diff) | |
| parent | f67cf39ba88ad7c4bee81445cc7a7468e0289f01 (diff) | |
| download | illumos-joyent-8aef19f7563fa7e20f072f46202468eb3bda3868.tar.gz | |
[illumos-gate merge]
commit f67cf39ba88ad7c4bee81445cc7a7468e0289f01
commit 7edb9f69d2426b044fa60c7a168c9eaeb12f1884
6431 document FreeBSD regex extensions
commit dfc115332c94a2f62058ac7f2bce7631fbd20b3d
7431 ZFS Channel Programs
Conflicts:
usr/src/lib/libzpool/common/sys/zfs_context.h
usr/src/lib/libzfs/common/libzfs_util.c
usr/src/lib/libzfs/common/libzfs_impl.h
Diffstat (limited to 'usr/src/tools/quick/make-zfs')
| -rwxr-xr-x | usr/src/tools/quick/make-zfs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr/src/tools/quick/make-zfs b/usr/src/tools/quick/make-zfs index 681b152640..57f20f0251 100755 --- a/usr/src/tools/quick/make-zfs +++ b/usr/src/tools/quick/make-zfs @@ -256,12 +256,14 @@ do_mans() { (cd $SRC/man/man1m && make \ $ROOT/usr/share/man/man1m/zdb.1m \ $ROOT/usr/share/man/man1m/zfs.1m \ + $ROOT/usr/share/man/man1m/zfs-program.1m \ $ROOT/usr/share/man/man1m/zpool.1m ) (cd $SRC/man/man5 && make \ $ROOT/usr/share/man/man5/zpool-features.5 ) ;; lint) - (cd $SRC/man/man1m && make zdb.1m.check zfs.1m.check zpool.1m.check) + (cd $SRC/man/man1m && make zdb.1m.check zfs.1m.check zfs-program.1m.check \ + zpool.1m.check) (cd $SRC/man/man5 && make zpool-features.5.check) ;; *) @@ -339,6 +341,7 @@ usr/sbin/$arch64/zinject usr/sbin/zstreamdump usr/share/man/man1m/zdb.1m usr/share/man/man1m/zfs.1m +usr/share/man/man1m/zfs-program.1m usr/share/man/man1m/zpool.1m usr/share/man/man5/zpool-features.5 " |