diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-10-22 13:31:19 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-10-22 13:31:19 +0000 |
| commit | 8d7ae6bdd828ec14f4680d67914200e1e421ec49 (patch) | |
| tree | 26c0e0557942902dec529177106c166afc7fb64e /usr/src/cmd/halt | |
| parent | b0c111b3e907993d2032ef8478d3ade9e22a18ca (diff) | |
| parent | bc4c0ff1343a311cc24933908ac6c4455af09031 (diff) | |
| download | illumos-joyent-8d7ae6bdd828ec14f4680d67914200e1e421ec49.tar.gz | |
[illumos-gate merge]
commit bc4c0ff1343a311cc24933908ac6c4455af09031
9880 Race in ZFS parallel mount
commit 975041dd3b571af240661f84d186e0cd0e36217b
9873 SMB logon fails during 1st second after service start
commit ab618543cc6fc4bc273c077ef5d247961cdb29d4
8158 Want named threads API
9857 proc manpages should have LIBRARY section
commit 62f63298eba531d48f87aa8c2089298cb7821962
9881 smbd terminated by SIGABRT after smb_account_free()
Conflicts:
usr/src/uts/common/sys/thread.h
usr/src/uts/common/fs/proc/prvnops.c
usr/src/uts/common/disp/thread.c
usr/src/man/man4/proc.4
usr/src/man/man1/ps.1
usr/src/lib/libc/port/threads/thr.c
Diffstat (limited to 'usr/src/cmd/halt')
| -rw-r--r-- | usr/src/cmd/halt/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/cmd/halt/Makefile b/usr/src/cmd/halt/Makefile index 98d8eccee4..a515a0a1ef 100644 --- a/usr/src/cmd/halt/Makefile +++ b/usr/src/cmd/halt/Makefile @@ -21,6 +21,7 @@ # Copyright 2016 Toomas Soome <tsoome@me.com> # Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright 2018 Joyent, Inc. # PROG = halt @@ -60,10 +61,10 @@ install := TARGET = install clean := TARGET = clean clobber := TARGET = clobber lint := TARGET = lint -lint := LINTFLAGS = -u +lint := LINTFLAGS += -u -all: $(PROG) +all: $(PROG) install: all $(ROOTUSRSBINPROG) $(ROOTLINKS) $(ROOTSYMLINKS) $(SUBDIRS) |