summaryrefslogtreecommitdiff
path: root/usr/src/cmd/print
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd/print')
-rw-r--r--usr/src/cmd/print/Makefile.sp21
-rw-r--r--usr/src/cmd/print/bsd-sysv-commands/Makefile1
-rw-r--r--usr/src/cmd/print/conv_fix/Makefile12
-rw-r--r--usr/src/cmd/print/lpget/Makefile12
-rw-r--r--usr/src/cmd/print/lpset/Makefile5
-rw-r--r--usr/src/cmd/print/ppdmgr/Makefile5
-rw-r--r--usr/src/cmd/print/printer-info/Makefile13
-rw-r--r--usr/src/cmd/print/printmgr/Makefile4
-rw-r--r--usr/src/cmd/print/printmgr/bin/Makefile15
-rw-r--r--usr/src/cmd/print/printmgr/com/sun/admin/pm/client/Makefile6
-rw-r--r--usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile6
-rw-r--r--usr/src/cmd/print/scripts/Makefile12
-rw-r--r--usr/src/cmd/print/selector/Makefile1
13 files changed, 22 insertions, 91 deletions
diff --git a/usr/src/cmd/print/Makefile.sp b/usr/src/cmd/print/Makefile.sp
index af1d87d236..ebf97b53c6 100644
--- a/usr/src/cmd/print/Makefile.sp
+++ b/usr/src/cmd/print/Makefile.sp
@@ -20,11 +20,9 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/print/Makefile.sp
# Common makefile definitions (should be) used by all print(lp) makefiles
#
@@ -55,23 +53,6 @@ ROOTLIBPRINTBIN= $(ROOTLIBPRINT)/bin
ROOTUSRUCB= $(ROOT)/usr/ucb
-
-#
-# Typical owner and group for LP things. These can be overridden
-# in the individual makefiles.
-#
-OWNER = root
-GROUP = lp
-SUPER = root
-
-$(ROOTINIT_D) := GROUP = sys
-$(ROOTRC0_D) := GROUP = sys
-$(ROOTRCS_D) := GROUP = sys
-$(ROOTRC1_D) := GROUP = sys
-$(ROOTRC2_D) := GROUP = sys
-$(ROOTUSRUCB) := GROUP = bin
-$(ROOTUSRSBIN) := GROUP = bin
-$(ROOTBIN) := GROUP = bin
#
# $(EMODES): Modes for executables
# $(SMODES): Modes for setuid executables
diff --git a/usr/src/cmd/print/bsd-sysv-commands/Makefile b/usr/src/cmd/print/bsd-sysv-commands/Makefile
index 6be41d2f21..a735b815c7 100644
--- a/usr/src/cmd/print/bsd-sysv-commands/Makefile
+++ b/usr/src/cmd/print/bsd-sysv-commands/Makefile
@@ -46,7 +46,6 @@ ROOTLIBLPPROGS = $(LIBLPPROGS:%=$(ROOTLIBLPBIN)/%)
FILEMODE = 0555
-OWNER = root
include ../../Makefile.cmd
diff --git a/usr/src/cmd/print/conv_fix/Makefile b/usr/src/cmd/print/conv_fix/Makefile
index 6bce653454..b9e9c76e82 100644
--- a/usr/src/cmd/print/conv_fix/Makefile
+++ b/usr/src/cmd/print/conv_fix/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,10 +19,8 @@
# CDDL HEADER END
#
#
-# Copyright (c) 1994,1998,2001 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident "%Z%%M% %I% %E% SMI"
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/lp/client/conv_fix/Makefile
#
@@ -39,7 +36,6 @@ OBJS= $(SRCS:.c=.o)
ROOTLIBPRINTPROG= $(PROG:%=$(ROOTLIBPRINT)/%)
FILEMODE= 0555
-OWNER= root
CPPFLAGS += -I$(NPRTINC)
diff --git a/usr/src/cmd/print/lpget/Makefile b/usr/src/cmd/print/lpget/Makefile
index a877ca51e7..db4d15b2b1 100644
--- a/usr/src/cmd/print/lpget/Makefile
+++ b/usr/src/cmd/print/lpget/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,10 +19,8 @@
# CDDL HEADER END
#
#
-# Copyright (c) 1994, 1995, 1996 by Sun Microsystems, Inc.
-# All Rights Reserved
-#
-# ident "%Z%%M% %I% %E% SMI"
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/lp/client/lpget/Makefile
#
@@ -39,7 +36,6 @@ OBJS= $(SRCS:.c=.o)
ROOTBINPROG= $(PROG:%=$(ROOTBIN)/%)
FILEMODE= 0511
-OWNER= root
CPPFLAGS += -I$(NPRTINC)
LDLIBS += $(LIBNPRT)
diff --git a/usr/src/cmd/print/lpset/Makefile b/usr/src/cmd/print/lpset/Makefile
index 39226da6a0..3c5e847eca 100644
--- a/usr/src/cmd/print/lpset/Makefile
+++ b/usr/src/cmd/print/lpset/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/lp/client/lpset/Makefile
#
@@ -38,7 +36,6 @@ OBJS= $(SRCS:.c=.o)
ROOTBINPROG= $(PROG:%=$(ROOTBIN)/%)
FILEMODE= 04511
-OWNER= root
CPPFLAGS += -I$(NPRTINC)
LDLIBS += $(LIBNPRT) -lsecdb
diff --git a/usr/src/cmd/print/ppdmgr/Makefile b/usr/src/cmd/print/ppdmgr/Makefile
index a92a560b64..ab8f07b46e 100644
--- a/usr/src/cmd/print/ppdmgr/Makefile
+++ b/usr/src/cmd/print/ppdmgr/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
MANIFEST= ppd-cache-update.xml
SVCMETHOD= ppd-cache-update
@@ -37,7 +35,6 @@ ROOTVARLP= $(ROOTVAR)/lp
ROOTVARLPPPD= $(ROOTVARLP)/ppd
ROOTVARLPPPDCACHES= $(ROOTVARLPPPD)/caches
-$(ROOTVARLP):= OWNER= lp
$(ROOTVARLP):= DIRMODE= 775
.KEEP_STATE:
diff --git a/usr/src/cmd/print/printer-info/Makefile b/usr/src/cmd/print/printer-info/Makefile
index 4bd90aeba9..6deed55e86 100644
--- a/usr/src/cmd/print/printer-info/Makefile
+++ b/usr/src/cmd/print/printer-info/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,13 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
-
-#
include ../Makefile.sp
@@ -37,8 +32,6 @@ SRCS = $(PROG).c
OBJECTS = $(PROG).o
ROOTPROG= $(PROG:%=$(ROOTLIBLPBIN)/%)
-$(ROOTPROG) := OWNER=root
-$(ROOTPROG) := GROUP=lp
$(ROOTPROG) := FILEMODE=555
.KEEP_STATE:
diff --git a/usr/src/cmd/print/printmgr/Makefile b/usr/src/cmd/print/printmgr/Makefile
index 3ff29873e4..4d3bc72a77 100644
--- a/usr/src/cmd/print/printmgr/Makefile
+++ b/usr/src/cmd/print/printmgr/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -52,8 +52,6 @@ ROOTAPPFILE = $(ROOTAPPDIR)/solaris-print-manager.desktop
$(ROOTAPPFILE):= FILEMODE = 444
$(ROOTBINPROG):= FILEMODE = 644
-$(ROOTBINPROG):= OWNER = root
-$(ROOTBINPROG):= GROUP = lp
.KEEP_STATE:
diff --git a/usr/src/cmd/print/printmgr/bin/Makefile b/usr/src/cmd/print/printmgr/bin/Makefile
index d0cc89cefe..2964b6306f 100644
--- a/usr/src/cmd/print/printmgr/bin/Makefile
+++ b/usr/src/cmd/print/printmgr/bin/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.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# Makefile for print manager wrapper script
#
@@ -38,9 +34,6 @@ ROOTBINPROG = $(PROG:%=$(ROOTBIN)/%)
ROOTDIRS = $(ROOT)/usr/sadm/admin \
$(ROOT)/usr/sadm/admin/bin
-$(ROOTBINPROG):= OWNER = root
-$(ROOTBINPROG):= GROUP = lp
-
.KEEP_STATE:
all: $(PROG)
diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/Makefile b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/Makefile
index 5133a2df50..f80827be30 100644
--- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/Makefile
+++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# Makefile for Java Print Manager client
#
include $(SRC)/Makefile.master
@@ -95,8 +93,6 @@ MSGDIR = $(ROOT)/usr/share/lib/locale/com/sun/admin/pm/client
MSGJAVAFILES = pmResources.java pmHelpResources.java
MSGFILES = $(MSGJAVAFILES:%=$(MSGDIR)/%)
-$(MSGFILES):= OWNER = root
-$(MSGFILES):= GROUP = lp
$(MSGFILES):= FILEMODE = 644
CLEANFILES= *.class pmHelpResources.java pmCopyright.java \
diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
index 35f3b5cb78..3aea1611f6 100644
--- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
+++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
#
# Makefile for Java Print Manager server
@@ -81,8 +79,6 @@ ROOTDIRS = $(ROOT)/usr/sadm/admin \
ROOTLIBDIR = $(ROOT)/usr/sadm/admin/printmgr/lib
ROOTLIBS= $(LIBS:%=$(ROOTLIBDIR)/%)
-$(ROOTLINKS):= OWNER = root
-$(ROOTLINKS):= GROUP = lp
# Following variables define where to find header files
CPPFLAGS += -I$(JAVA_ROOT)/include -I$(JAVA_ROOT)/include/solaris -I.
diff --git a/usr/src/cmd/print/scripts/Makefile b/usr/src/cmd/print/scripts/Makefile
index 33412c7aed..7dfa94546e 100644
--- a/usr/src/cmd/print/scripts/Makefile
+++ b/usr/src/cmd/print/scripts/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -30,12 +30,8 @@ ROOTLIBLPBIN = $(ROOTLIBLP)/bin
ROOTVARLP = $(ROOTVAR)/lp
ROOTVARLPPPD = $(ROOTVARLP)/ppd
-$(ROOTVARSPOOLPRINT) := OWNER=root
-$(ROOTVARLP) := OWNER=lp
$(ROOTVARLP) := DIRMODE=0775
-OWNER = root
-GROUP = lp
FILEMODE = 0755
MSGFILES = lpadmin ppdmgr
@@ -52,14 +48,10 @@ $(ROOTUSRSBINPROG) := FILEMODE=555
PCONF= printers.conf
ROOTPCONF= $(PCONF:%=$(ROOTETC)/%)
-$(ROOTPCONF) := OWNER=root
-$(ROOTPCONF) := GROUP=sys
$(ROOTPCONF) := FILEMODE=644
MANUFALIASES= manufaliases
ROOTMANUFALIASES= $(MANUFALIASES:%=$(ROOTVARLPPPD)/%)
-$(ROOTMANUFALIASES) := OWNER=root
-$(ROOTMANUFALIASES) := GROUP=lp
$(ROOTMANUFALIASES) := FILEMODE=444
LIBLPPROGS= getmakes getmodels getppdfile getppds ppdfilename2mmp \
@@ -69,8 +61,6 @@ LIBLPPROGS= getmakes getmodels getppdfile getppds ppdfilename2mmp \
desktop-print-management-prefs
ROOTLIBLPPROGS= $(LIBLPPROGS:%=$(ROOTLIBLPBIN)/%)
-$(ROOTLIBLPPROGS) := OWNER=root
-$(ROOTLIBLPPROGS) := GROUP=lp
$(ROOTLIBLPPROGS) := FILEMODE=555
LIBLINKS= $(ROOTLIB)/lpadmin $(ROOTLIB)/lpsystem
diff --git a/usr/src/cmd/print/selector/Makefile b/usr/src/cmd/print/selector/Makefile
index faa0a1bb77..9cd5704869 100644
--- a/usr/src/cmd/print/selector/Makefile
+++ b/usr/src/cmd/print/selector/Makefile
@@ -39,7 +39,6 @@ ROOTUSRBINLINKS = $(BINLINKS:%=$(ROOTBIN)/%)
ROOTUSRSBINLINKS = $(SBINLINKS:%=$(ROOTUSRSBIN)/%)
FILEMODE = 0555
-OWNER = root
$(ROOTUSRBINLINKS):
$(RM) $@; $(SYMLINK) ../sbin/$(SBINPROG) $@
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-20 21:39:16 +0000