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/ypcmd | |
| 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/ypcmd')
| -rw-r--r-- | usr/src/cmd/ypcmd/Makefile | 9 | ||||
| -rw-r--r-- | usr/src/cmd/ypcmd/yppasswd/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/ypcmd/ypupdated/Makefile | 9 |
3 files changed, 7 insertions, 13 deletions
diff --git a/usr/src/cmd/ypcmd/Makefile b/usr/src/cmd/ypcmd/Makefile index 27206581a8..7c8ff59622 100644 --- a/usr/src/cmd/ypcmd/Makefile +++ b/usr/src/cmd/ypcmd/Makefile @@ -32,7 +32,7 @@ NETYPPROG = ypbind ypxfr yppush udpublickey mkalias \ ypxfr_1perday ypxfr_1perhour ypxfr_2perday \ ypstart ypstop NIS2LDAPPROG = ypxfrd ypserv ypxfr -METHOD = yp +SVCMETHOD = yp PROG= $(BINPROG) $(SBINPROG) $(NETYPPROG) $(NIS2LDAPPROG) $(METHOD) MANIFEST = server.xml client.xml xfr.xml @@ -40,7 +40,6 @@ MANIFEST = server.xml client.xml xfr.xml include ../Makefile.cmd ROOTMANIFESTDIR = $(ROOTSVCNETWORKNIS) -ROOTMETHOD = $(ROOTLIBSVCMETHOD)/$(METHOD) # installed directories NETSVC = $(ROOTLIB)/netsvc @@ -61,7 +60,6 @@ ypset := LDLIBS += -lnsl $(ROOTVAR_YP)/aliases := GROUP=bin $(ROOTVAR_YP)/aliases := FILEMODE=555 -$(ROOTMANIFEST) := FILEMODE = 0444 YPFILES = Makefile aliases nicknames updaters ETCFILES = publickey @@ -256,7 +254,7 @@ stdhosts: $(STDHOSTSOBJ) install: all $(PROG) $(ROOTDIRS) $(ROOTETCFILE) $(ROOTYPFILES) $(IBINPROG) \ $(ISBINPROG) $(INETYPPROG) $(INIS2LDAPPROG) $(SUBDIRS) $(ROOTMANIFEST) \ - $(ROOTMETHOD) + $(ROOTSVCMETHOD) $(ROOTDIRS): $(INS.dir) @@ -299,6 +297,7 @@ clean: $(SUBDIRS) $(RM) $(OBJS) $(CLEANFILES) clobber: clean $(SUBDIRS) - $(RM) $(PROG) FRC: + +include ../Makefile.targ diff --git a/usr/src/cmd/ypcmd/yppasswd/Makefile b/usr/src/cmd/ypcmd/yppasswd/Makefile index caa961d575..50a54bc1f6 100644 --- a/usr/src/cmd/ypcmd/yppasswd/Makefile +++ b/usr/src/cmd/ypcmd/yppasswd/Makefile @@ -77,8 +77,6 @@ $(INETSVC) := FILEMODE=555 $(ETCDFLTFILE) := GROUP=sys $(ETCDFLTFILE) := FILEMODE=0444 -$(ROOTMANIFEST) := FILEMODE = 0444 - #install rules .KEEP_STATE: diff --git a/usr/src/cmd/ypcmd/ypupdated/Makefile b/usr/src/cmd/ypcmd/ypupdated/Makefile index a6dcc0afa2..ad3c3513d3 100644 --- a/usr/src/cmd/ypcmd/ypupdated/Makefile +++ b/usr/src/cmd/ypcmd/ypupdated/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. # # ident "%Z%%M% %I% %E% SMI" @@ -59,8 +58,6 @@ SRCS = $(OBJS:%.o=%.c) $(INETSVC) := GROUP=bin $(INETSVC) := FILEMODE=555 -$(ROOTMANIFEST) := FILEMODE = 0444 - #install rules .KEEP_STATE: |