diff options
| author | amaguire <none@none> | 2006-11-02 15:30:18 -0800 |
|---|---|---|
| committer | amaguire <none@none> | 2006-11-02 15:30:18 -0800 |
| commit | a192e900f6d2b0e1a822e3252c0dfd795ed49d76 (patch) | |
| tree | 14da911f3b9e55e737b4d0f2597cdc69105c3023 /usr/src/cmd/sa | |
| parent | ac92251dc182f030faf6a5f76981d551b0b16072 (diff) | |
| download | illumos-joyent-a192e900f6d2b0e1a822e3252c0dfd795ed49d76.tar.gz | |
PSARC 2006/552 Quagga SMF Modifications
6312914 routeadm needs to support smf-based routing services
6440342 remove redundancies in smf-related makefiles by moving manifest rules to usr/src/cmd/Makefile.targ
--HG--
rename : usr/src/cmd/cmd-inet/usr.sbin/in.rdisc.c => usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/in.rdisc.c
rename : usr/src/cmd/cmd-inet/usr.sbin/routeadm.c => usr/src/cmd/cmd-inet/usr.sbin/routeadm/routeadm.c
rename : deleted_files/usr/src/cmd/volmgt/etc/Makefile => usr/src/cmd/volmgt/etc/Makefile
Diffstat (limited to 'usr/src/cmd/sa')
| -rw-r--r-- | usr/src/cmd/sa/Makefile | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/usr/src/cmd/sa/Makefile b/usr/src/cmd/sa/Makefile index a9670677e6..01fa461908 100644 --- a/usr/src/cmd/sa/Makefile +++ b/usr/src/cmd/sa/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #pragma ident "%Z%%M% %I% %E% SMI" @@ -28,12 +27,12 @@ # cmd/sa/Makefile # -include ../Makefile.cmd - MANIFEST = sar.xml +SVCMETHOD = svc-sar + +include ../Makefile.cmd ROOTMANIFESTDIR = $(ROOTSVCSYSTEM) -ROOTMETHOD = $(ROOTLIBSVCMETHOD)/svc-sar GREP= grep @@ -97,7 +96,6 @@ $(ROOTBIN)/$(TIMEX) := GROUP = sys # $(ROOTUSRSBIN)/$(SADP) := GROUP = sys $(LIBSAD)/$(SADC) := FILEMODE = 0555 $(LIBSAD)/$(SADC) := GROUP = bin -$(ROOTMANIFEST) := FILEMODE = 0444 .KEEP_STATE: @@ -111,20 +109,12 @@ $(SADC): $(SADC_OBJECTS) $(LINK.c) -o $@ $(SADC_OBJECTS) $(LDLIBS) $(POST_PROCESS) -$(ROOTSVCSYSTEM)/perf.xml := OWNER = root -$(ROOTSVCSYSTEM)/perf.xml := GROUP = sys -$(ROOTSVCSYSTEM)/perf.xml := FILEMODE = 0444 - -$(ROOTLIBSVCMETHOD)/svc-perf := OWNER = root -$(ROOTLIBSVCMETHOD)/svc-perf := GROUP = bin -$(ROOTLIBSVCMETHOD)/svc-perf := FILEMODE = 0555 - # The edit of SYSCRONTAB must be done unconditionally because of the # creation of this file by a different component (Adm) and the possible # backdating. install: all $(ROOTPROG) $(ROOTUSBINPROG) \ $(ROOTINITSHELL) $(ROOTLIBSHELL) $(ROOTSYMLINKS) \ - $(ROOTMANIFEST) $(ROOTMETHOD) $(ROOTLIBPROG) + $(ROOTMANIFEST) $(ROOTSVCMETHOD) $(ROOTLIBPROG) @if [ -f $(SYSCRONTAB) ]; \ then \ if $(GREP) "sa1" $(SYSCRONTAB) >/dev/null 2>&1 ; then :; \ |