Skip to content
Browse files

6880460 some root-build bits were missed by 6864230

6414832 SUNWonbld gk account should be removed
6536468 date in Nevada motd should be changed
6855668 webrev mangles dates in non-Romanised locales
6866716 estimation of max-jobs for /.make.machines is incorrect
6589104 make POUND_SIGN less of a drag
6750554 build rule for mcs gives shell+date a real workout
6885068 no need for raciness
Portions contributed by Rich Lowe
  • Loading branch information...
1 parent 26f848c commit 48bc00d6814e04ff3edb32cafe7d1bc580baff68 jmcp committed
Showing with 906 additions and 1,182 deletions.
  1. +13 −8 usr/src/Makefile.master
  2. +0 −9 usr/src/Makefile.psm
  3. +19 −19 usr/src/Makefile.psm.targ
  4. +192 −286 usr/src/Targetdirs
  5. +0 −5 usr/src/cmd/cron/Makefile
  6. +0 −2 usr/src/cmd/fcoesvc/Makefile
  7. +0 −2 usr/src/cmd/mdb/Makefile.kmdb
  8. +2 −3 usr/src/cmd/mdb/intel/amd64/kmdb/Makefile
  9. +2 −3 usr/src/cmd/mdb/intel/ia32/kmdb/Makefile
  10. +3 −4 usr/src/cmd/mdb/sun4u/v9/kmdb/Makefile
  11. +3 −4 usr/src/cmd/mdb/sun4v/v9/kmdb/Makefile
  12. +4 −4 usr/src/cmd/oplhpd/Makefile
  13. +1 −1 usr/src/cmd/scadm/Makefile.com
  14. +3 −3 usr/src/cmd/sf880drd/Makefile
  15. +2 −2 usr/src/lib/cfgadm_plugins/Makefile.com
  16. +4 −7 usr/src/lib/cfgadm_plugins/ac/Makefile.com
  17. +3 −5 usr/src/lib/cfgadm_plugins/pci/Makefile.com
  18. +4 −7 usr/src/lib/cfgadm_plugins/sbd/Makefile.com
  19. +4 −7 usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
  20. +0 −1 usr/src/lib/hbaapi/Makefile.com
  21. +2 −2 usr/src/lib/libc_psr/sun4u-opl/Makefile
  22. +3 −4 usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile
  23. +3 −4 usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile
  24. +4 −6 usr/src/lib/libc_psr/sun4u-us3/Makefile
  25. +1 −1 usr/src/lib/libc_psr/sun4u/sparc/Makefile
  26. +1 −1 usr/src/lib/libc_psr/sun4u/sparcv9/Makefile
  27. +2 −4 usr/src/lib/libc_psr/sun4u_hwcap1/sparc/Makefile
  28. +2 −4 usr/src/lib/libc_psr/sun4u_hwcap1/sparcv9/Makefile
  29. +2 −4 usr/src/lib/libc_psr/sun4u_hwcap2/sparc/Makefile
  30. +2 −4 usr/src/lib/libc_psr/sun4u_hwcap2/sparcv9/Makefile
  31. +3 −5 usr/src/lib/libc_psr/sun4v/Makefile
  32. +1 −1 usr/src/lib/libc_psr/sun4v_hwcap1/sparc/Makefile
  33. +1 −1 usr/src/lib/libc_psr/sun4v_hwcap1/sparcv9/Makefile
  34. +1 −1 usr/src/lib/libc_psr/sun4v_hwcap2/sparc/Makefile
  35. +1 −1 usr/src/lib/libc_psr/sun4v_hwcap2/sparcv9/Makefile
  36. +2 −2 usr/src/lib/libmd/Makefile.com
  37. +1 −6 usr/src/lib/libmd/sun4u/Makefile.links
  38. +2 −4 usr/src/lib/libmd/sun4v/sparc/Makefile
  39. +2 −2 usr/src/lib/libmd/sun4v/sparcv9/Makefile
  40. +3 −3 usr/src/lib/libpcp/sparc/Makefile
  41. +2 −2 usr/src/lib/libprtdiag_psr/sparc/cherrystone/Makefile
  42. +2 −2 usr/src/lib/libprtdiag_psr/sparc/daktari/Makefile
  43. +2 −2 usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile
  44. +2 −2 usr/src/lib/libprtdiag_psr/sparc/montecarlo/Makefile
  45. +3 −3 usr/src/lib/libprtdiag_psr/sparc/montoya/Makefile
  46. +3 −3 usr/src/lib/libprtdiag_psr/sparc/monza/Makefile
  47. +3 −3 usr/src/lib/libprtdiag_psr/sparc/ontario/Makefile
  48. +2 −2 usr/src/lib/libprtdiag_psr/sparc/schumacher/picl/Makefile
  49. +2 −2 usr/src/lib/librsc/Makefile.com
  50. +4 −4 usr/src/lib/libtsalarm/sparc/Makefile
  51. +1 −1 usr/src/lib/pkcs11/libsoftcrypto/Makefile.com
  52. +0 −3 usr/src/lib/smhba/Makefile.com
  53. +6 −8 usr/src/psm/stand/bootblks/ufs/Makefile
  54. +4 −0 usr/src/tools/Makefile.tools
  55. +0 −88 usr/src/tools/SUNWonbld/postinstall
  56. +0 −58 usr/src/tools/SUNWonbld/preremove
  57. +1 −2 usr/src/tools/SUNWonbld/prototype_com
  58. +10 −4 usr/src/tools/gk/Makefile
  59. +48 −0 usr/src/tools/gk/gen_make.machines.sh
  60. +12 −2 usr/src/tools/scripts/bldenv.sh
  61. +3 −1 usr/src/tools/scripts/nightly.1
  62. +10 −3 usr/src/tools/scripts/nightly.sh
  63. +2 −1 usr/src/tools/scripts/webrev.sh
  64. +5 −5 usr/src/uts/Makefile.targ
  65. +9 −10 usr/src/uts/i86pc/i86hvm/Makefile.targ
  66. +1 −1 usr/src/uts/i86pc/sys/Makefile
  67. +1 −1 usr/src/uts/i86pc/vm/Makefile
  68. +1 −1 usr/src/uts/i86xpv/sys/Makefile
  69. +1 −1 usr/src/uts/i86xpv/vm/Makefile
  70. +3 −3 usr/src/uts/sun4u/Makefile
  71. +5 −5 usr/src/uts/sun4u/aes/Makefile
  72. +13 −14 usr/src/uts/sun4u/blade/Makefile.targ.shared
  73. +12 −12 usr/src/uts/sun4u/boston/Makefile.targ
  74. +16 −17 usr/src/uts/sun4u/cherrystone/Makefile.targ
  75. +1 −1 usr/src/uts/sun4u/cherrystone/sys/Makefile
  76. +15 −16 usr/src/uts/sun4u/chicago/Makefile.targ
  77. +10 −10 usr/src/uts/sun4u/chicago/fpc/Makefile
  78. +16 −17 usr/src/uts/sun4u/daktari/Makefile.targ
  79. +1 −1 usr/src/uts/sun4u/daktari/sys/Makefile
  80. +8 −9 usr/src/uts/sun4u/darwin/Makefile.targ
  81. +10 −14 usr/src/uts/sun4u/douglas/Makefile.targ.shared
  82. +14 −18 usr/src/uts/sun4u/enchilada/Makefile.targ
  83. +14 −18 usr/src/uts/sun4u/excalibur/Makefile.targ
  84. +0 −3 usr/src/uts/sun4u/excalibur/sys/Makefile
  85. +13 −14 usr/src/uts/sun4u/fjlite/Makefile.targ
  86. +12 −17 usr/src/uts/sun4u/grover/Makefile.targ.shared
  87. +13 −14 usr/src/uts/sun4u/javelin/Makefile.targ.shared
  88. +15 −16 usr/src/uts/sun4u/littleneck/Makefile.targ
  89. +12 −14 usr/src/uts/sun4u/lw2plus/Makefile.targ
  90. +13 −13 usr/src/uts/sun4u/lw8/Makefile.targ
  91. +1 −1 usr/src/uts/sun4u/lw8/sys/Makefile
  92. +24 −24 usr/src/uts/sun4u/makaha/Makefile.targ
  93. +15 −16 usr/src/uts/sun4u/montecarlo/Makefile.targ.shared
  94. +1 −1 usr/src/uts/sun4u/montecarlo/sys/Makefile
  95. +12 −12 usr/src/uts/sun4u/mpxu/Makefile.targ.shared
  96. +1 −1 usr/src/uts/sun4u/mpxu/sys/Makefile
  97. +1 −1 usr/src/uts/sun4u/ngdr/sys/Makefile
  98. +14 −14 usr/src/uts/sun4u/opl/Makefile.targ.shared
  99. +0 −3 usr/src/uts/sun4u/opl/sys/Makefile
  100. +8 −9 usr/src/uts/sun4u/quasar/Makefile.targ
  101. +12 −15 usr/src/uts/sun4u/schumacher/Makefile.targ
  102. +12 −12 usr/src/uts/sun4u/seattle/Makefile.targ
  103. +17 −18 usr/src/uts/sun4u/serengeti/Makefile.targ.shared
  104. +1 −1 usr/src/uts/sun4u/serengeti/sys/Makefile
  105. +15 −15 usr/src/uts/sun4u/snowbird/Makefile.targ
  106. +1 −1 usr/src/uts/sun4u/snowbird/sys/Makefile
  107. +17 −19 usr/src/uts/sun4u/starcat/Makefile.targ.shared
  108. +0 −3 usr/src/uts/sun4u/starcat/sys/Makefile
  109. +16 −18 usr/src/uts/sun4u/starfire/Makefile.targ
  110. +1 −1 usr/src/uts/sun4u/starfire/sys/Makefile
  111. +11 −11 usr/src/uts/sun4u/sunfire/Makefile.targ.shared
  112. +1 −1 usr/src/uts/sun4u/sunfire/sys/Makefile
  113. +3 −3 usr/src/uts/sun4u/sys/Makefile
  114. +14 −18 usr/src/uts/sun4u/taco/Makefile.targ
  115. +12 −16 usr/src/uts/sun4u/tazmo/Makefile.targ.shared
  116. +1 −1 usr/src/uts/sun4u/vm/Makefile
  117. +19 −19 usr/src/uts/sun4v/Makefile
  118. +10 −10 usr/src/uts/sun4v/montoya/Makefile.targ
  119. +10 −13 usr/src/uts/sun4v/ontario/Makefile.targ
  120. +1 −1 usr/src/uts/sun4v/sys/Makefile
  121. +1 −1 usr/src/uts/sun4v/vm/Makefile
View
21 usr/src/Makefile.master
@@ -54,12 +54,18 @@ ROOT= /proto
#
# The declaration POUND_SIGN is always '#'. This is needed to get around the
# make feature that '#' is always a comment delimiter, even when escaped or
-# quoted. The only way of generating this is the :sh macro mechanism. Note
-# however that in general :sh macros should be avoided in makefiles that are
-# widely included into other makefiles, as the resulting shell executions can
-# cause a noticable slowdown in build times.
+# quoted. We use this macro expansion method to get POUND_SIGN rather than
+# always breaking out a shell because the general case can cause a noticable
+# slowdown in build times when so many Makefiles include Makefile.master.
#
-POUND_SIGN:sh= echo \\043
+# While the majority of users are expected to override the setting below
+# with an env file (via nightly or bldenv), if you aren't building that way
+# (ie, you're using "ws" or some other bootstrapping method) then you need
+# this definition in order to avoid the subshell invocation mentioned above.
+#
+
+PRE_POUND= pre\#
+POUND_SIGN= $(PRE_POUND:pre\%=%)
NOT_RELEASE_BUILD=
INTERNAL_RELEASE_BUILD= $(POUND_SIGN)
@@ -885,11 +891,10 @@ RELEASE_MINOR= 11
RELEASE= $(RELEASE_MAJOR).$(RELEASE_MINOR)
VERSION= SunOS Development
PATCHID= $(VERSION)
-RELEASE_DATE= October 2007
+RELEASE_DATE= release date not set
PATCH_DATE= $(RELEASE_DATE)
RELEASE_CM= "@($(POUND_SIGN))SunOS $(RELEASE) $(PATCHID) $(PATCH_DATE)"
-DEV_CM= "@($(POUND_SIGN))SunOS Internal Development: \
-`$(ECHO) $$LOGNAME` `date +%Y-%m-%d` `$(ECHO) [\`basename $$CODEMGR_WS\`]`"
+DEV_CM= "@($(POUND_SIGN))SunOS Internal Development: non-nightly build"
PROCESS_COMMENT= @?${MCS} -c -a $(RELEASE_CM) -a $(DEV_CM)
$(STRIP_COMMENTS)PROCESS_COMMENT= @?${MCS} -d -a $(RELEASE_CM) -a $(DEV_CM)
View
9 usr/src/Makefile.psm
@@ -26,16 +26,7 @@
#
# Makefile.psm, global definitions for platform specific modules
-#
-# The distinction between root.sys and root.bin is largely historical;
-# the files in group bin used to be owned by user bin.
-#
-INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@
-INS.dir.root.bin= $(INS) -s -d -m $(DIRMODE) $@
-#
-#
-#
ROOT_PLAT_DIR = $(ROOT)/platform
ROOT_PSM_DIR = $(ROOT_PLAT_DIR)/$(PLATFORM)
View
38 usr/src/Makefile.psm.targ
@@ -28,26 +28,26 @@
# Installation targets and rules:
#
$(ROOT_PLAT_DIR) $(USR_PLAT_DIR):
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(ROOT_PSM_DIR): $(ROOT_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(ROOT_BOOT_PSM_KERN_DIR):
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(ROOT_PSM_LIB_DIR) \
$(ROOT_PSM_SBIN_DIR): $(ROOT_PSM_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(ROOT_PSM_LIB64_DIR): $(ROOT_PSM_LIB_DIR)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(ROOT_PSM_MOD_DIR): $(ROOT_PSM_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(ROOT_PSM_MOD_DIRS_32): $(ROOT_PSM_MOD_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(ROOT_PSM_DIR)/%: % $(ROOT_PSM_DIR)
$(INS.file)
@@ -113,13 +113,13 @@ $(ROOT_PSM_BRAND_DIR)/%: $(OBJS_DIR)/% $(ROOT_PSM_BRAND_DIR) FRC
$(INS.file)
$(ROOT_PSM_LIB_FS_DIR): $(ROOT_PSM_LIB_DIR)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(ROOT_PSM_LIB_UFS_DIR) \
$(ROOT_PSM_LIB_NFS_DIR) \
$(ROOT_PSM_LIB_HSFS_DIR) \
$(ROOT_PSM_LIB_ZFS_DIR): $(ROOT_PSM_LIB_FS_DIR)
- $(INS.dir.root.bin)
+ $(INS.dir)
$(ROOT_PSM_LIB_UFS_DIR)/%: % $(ROOT_PSM_LIB_UFS_DIR)
$(INS.file)
@@ -137,34 +137,34 @@ $(ROOT_PSM_LIB_ZFS_DIR)/%: % $(ROOT_PSM_LIB_ZFS_DIR)
#
#
$(USR_PSM_DIR): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(USR_PSM_INCL_DIR) \
$(USR_PSM_LIB_DIR) \
$(USR_PSM_SBIN_DIR): $(USR_PSM_DIR)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_LIB64_DIR): $(USR_PSM_LIB_DIR)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_LIB_FS_DIR): $(USR_PSM_LIB_DIR) $(LINKED_LIB_FS_DIRS)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_LIB_UFS_DIR) \
$(USR_PSM_LIB_NFS_DIR) \
$(USR_PSM_LIB_HSFS_DIR) \
$(USR_PSM_LIB_ZFS_DIR): $(USR_PSM_LIB_FS_DIR)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_MOD_DIR): $(USR_PSM_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(USR_PSM_MOD_DIRS_32): $(USR_PSM_MOD_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(USR_PSM_ISYS_DIR) \
$(USR_PSM_IVM_DIR): $(USR_PSM_INCL_DIR)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_INCL_DIR)/%: % $(USR_PSM_INCL_DIR)
$(INS.file)
@@ -227,10 +227,10 @@ $(USR_PSM_DACF_DIR)/%: % $(USR_PSM_DACF_DIR) FRC
# links in /usr/platform
#
$(LINKED_DIRS): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_LIB_DIRS): $(LINKED_DIRS)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_ADB_DIRS): $(LINKED_LIB_DIRS)
-$(INS.slink6)
View
478 usr/src/Targetdirs
@@ -24,43 +24,52 @@
#
#
-# The list is built of owner-group combinations. ROOT.SYS occurs twice
-# because some directories owned by root and in group sys are subdirectories
-# of directories having other owner-group attributes.
-#
# It is easier to think in terms of directory names without the ROOT macro
# prefix. ROOTDIRS is TARGETDIRS with ROOT prefixes. It is necessary
# to work with ROOT prefixes when controlling conditional assignments.
#
-# The macro SYM.ROOT.SYS means symlinks with owner root and group sys.
-
-SYMLINKS= $(SYM.ROOT.SYS) $(SYM.ROOT.BIN) $(SYM.OTHERS)
-TARGETDIRS= $(ROOT.SYS) $(ROOT.BIN) $(ROOT.SYS2) \
- $(UUCP.UUCP) $(OTHERS) $(ROOT.OTHER) \
- $(SYM.USRCCSLIB) $(SYM.USRLIB)
+DIRLINKS= $(SYM.DIRS)
+$(BUILD64) DIRLINKS += $(SYM.DIRS64)
-$(BUILD64) TARGETDIRS += $(ROOT.SYS64.2) $(ROOT.BIN64) \
- $(SYM.USRCCSLIB64) $(SYM.USRLIB64)
+FILELINKS= $(SYM.USRCCSLIB) $(SYM.USRLIB)
+$(BUILD64) FILELINKS += $(SYM.USRCCSLIB64) $(SYM.USRLIB64)
-$(BUILD64) SYMLINKS += $(SYM.ROOT.BIN64)
+TARGETDIRS= $(DIRS)
+$(BUILD64) TARGETDIRS += $(DIRS64)
-TARGETDIRS += $(SYMLINKS)
+TARGETDIRS += $(FILELINKS) $(DIRLINKS)
-i386_ROOT.SYS= \
+i386_DIRS= \
/boot/acpi \
/boot/acpi/tables \
/boot/grub \
/boot/grub/bin \
- /platform/i86pc
+ /platform/i86pc \
+ /usr/lib/brand/lx \
+ /usr/lib/brand/lx/amd64 \
+ /usr/lib/brand/lx/distros \
+ /usr/lib/xen \
+ /usr/lib/xen/bin
-sparc_ROOT.SYS=
+sparc_DIRS= \
+ /usr/lib/ldoms
-ROOT.SYS= \
+# EXPORT DELETE START
+XDIRS= \
+ /usr/lib/inet/wanboot
+# EXPORT DELETE END
+
+sparc_64ONLY= $(POUND_SIGN)
+64ONLY= $($(MACH)_64ONLY)
+
+$(64ONLY) MACH32_DIRS=/usr/ucb/$(MACH32)
+
+DIRS= \
/boot \
/boot/solaris \
/boot/solaris/bin \
- $($(MACH)_ROOT.SYS) \
+ $($(MACH)_DIRS) \
/dev \
/dev/dsk \
/dev/fd \
@@ -71,6 +80,7 @@ ROOT.SYS= \
/dev/pts \
/dev/sad \
/dev/swap \
+ /dev/term \
/dev/vt \
/dev/zcons \
/devices \
@@ -83,10 +93,13 @@ ROOT.SYS= \
/etc/crypto \
/etc/crypto/certs \
/etc/crypto/crls \
+ /etc/dbus-1 \
+ /etc/dbus-1/system.d \
/etc/default \
/etc/devices \
/etc/dev \
/etc/dfs \
+ /etc/dladm \
/etc/fs \
/etc/fs/nfs \
/etc/fs/zfs \
@@ -113,12 +126,24 @@ ROOT.SYS= \
/etc/init.d \
/etc/dhcp \
/etc/lib \
+ /etc/mail \
+ /etc/mail/cf \
+ /etc/mail/cf/cf \
+ /etc/mail/cf/domain \
+ /etc/mail/cf/feature \
+ /etc/mail/cf/m4 \
+ /etc/mail/cf/mailer \
+ /etc/mail/cf/ostype \
+ /etc/mail/cf/sh \
+ /etc/net-snmp \
+ /etc/net-snmp/snmp \
/etc/opt \
/etc/rc0.d \
/etc/rc1.d \
/etc/rc2.d \
/etc/rc3.d \
/etc/rcS.d \
+ /etc/saf \
/etc/sasl \
/etc/sfw \
/etc/svc \
@@ -129,98 +154,6 @@ ROOT.SYS= \
/etc/zones \
/export \
/home \
- /kernel \
- /mnt \
- /opt \
- /platform \
- /proc \
- /root \
- /sbin \
- /system \
- /system/contract \
- /system/object \
- /usr \
- /usr/kernel \
- /usr/platform \
- /usr/share \
- /var \
- /var/adm \
- /var/adm/pool \
- /var/adm/sm.bin \
- /var/adm/streams \
- /var/cores \
- /var/cron \
- /var/db \
- /var/db/ipf \
- /var/krb5 \
- /var/krb5/rcache \
- /var/krb5/rcache/root \
- /var/log \
- /var/log/pool \
- /var/sadm \
- /var/sadm/pkg \
- /var/sadm/security \
- /var/opt \
- /var/run \
- /var/smb \
- /var/svc \
- /var/svc/log \
- /var/svc/manifest \
- /var/svc/manifest/milestone \
- /var/svc/manifest/device \
- /var/svc/manifest/system \
- /var/svc/manifest/system/device \
- /var/svc/manifest/system/filesystem \
- /var/svc/manifest/system/security \
- /var/svc/manifest/system/svc \
- /var/svc/manifest/network \
- /var/svc/manifest/network/dns \
- /var/svc/manifest/network/ipsec \
- /var/svc/manifest/network/ldap \
- /var/svc/manifest/network/nfs \
- /var/svc/manifest/network/nis \
- /var/svc/manifest/network/rpc \
- /var/svc/manifest/network/security \
- /var/svc/manifest/network/shares \
- /var/svc/manifest/network/ssl \
- /var/svc/manifest/application \
- /var/svc/manifest/application/management \
- /var/svc/manifest/application/security \
- /var/svc/manifest/application/print \
- /var/svc/manifest/platform \
- /var/svc/manifest/platform/sun4u \
- /var/svc/manifest/platform/sun4v \
- /var/svc/manifest/site \
- /var/svc/profile \
- /var/tsol \
- /var/tsol/doors
-
-# EXPORT DELETE START
-XROOT.BIN= \
- /usr/lib/inet/wanboot
-# EXPORT DELETE END
-
-i386_ROOT.BIN= \
- /usr/lib/brand/lx \
- /usr/lib/brand/lx/amd64 \
- /usr/lib/brand/lx/distros \
- /usr/lib/xen \
- /usr/lib/xen/bin
-
-sparc_ROOT.BIN= \
- /usr/lib/ldoms
-
-sparc_64ONLY= $(POUND_SIGN)
-64ONLY= $($(MACH)_64ONLY)
-
-$(64ONLY) MACH32_ROOT.UCB=/usr/ucb/$(MACH32)
-ROOT.BIN= \
- $($(MACH)_ROOT.BIN) \
- /etc/dbus-1 \
- /etc/dbus-1/system.d \
- /etc/saf \
- /etc/net-snmp \
- /etc/net-snmp/snmp \
/lib \
/lib/crypto \
/lib/inet \
@@ -232,6 +165,18 @@ ROOT.BIN= \
/lib/svc/monitor \
/lib/svc/seed \
/lib/svc/share \
+ /kernel \
+ /mnt \
+ /opt \
+ /platform \
+ /proc \
+ /root \
+ /sbin \
+ /system \
+ /system/contract \
+ /system/object \
+ /tmp \
+ /usr \
/usr/4lib \
/usr/ast \
/usr/ast/bin \
@@ -245,7 +190,6 @@ ROOT.BIN= \
/usr/games \
/usr/include \
/usr/include/ast \
- /usr/include/sys/crypto \
/usr/include/fm \
/usr/include/gssapi \
/usr/include/hal \
@@ -255,7 +199,9 @@ ROOT.BIN= \
/usr/include/sasl \
/usr/include/scsi \
/usr/include/security \
+ /usr/include/sys/crypto \
/usr/include/tsol \
+ /usr/kernel \
/usr/kvm \
/usr/lib \
/usr/lib/abi \
@@ -272,17 +218,22 @@ ROOT.BIN= \
/usr/lib/crypto \
/usr/lib/drv \
/usr/lib/elfedit \
+ /usr/lib/fm \
/usr/lib/font \
+ /usr/lib/fs \
+ /usr/lib/fs/nfs \
+ /usr/lib/fs/proc \
+ /usr/lib/fs/smb \
+ /usr/lib/fs/zfs \
+ /usr/lib/gss \
+ /usr/lib/hal \
/usr/lib/inet \
/usr/lib/inet/dhcp \
/usr/lib/inet/dhcp/nsu \
/usr/lib/inet/dhcp/svc \
/usr/lib/inet/dhcp/svcadm \
/usr/lib/inet/$(MACH32) \
- $(XROOT.BIN) \
- /usr/lib/fm \
- /usr/lib/gss \
- /usr/lib/hal \
+ $(XDIRS) \
/usr/lib/krb5 \
/usr/lib/link_audit \
/usr/lib/libp \
@@ -290,12 +241,20 @@ ROOT.BIN= \
/usr/lib/localedef/extensions \
/usr/lib/localedef/src \
/usr/lib/lwp \
+ /usr/lib/mdb \
+ /usr/lib/mdb/kvm \
+ /usr/lib/mdb/proc \
+ /usr/lib/mdb/disasm \
+ /usr/lib/nfs \
+ /usr/net \
+ /usr/net/servers \
/usr/lib/pool \
/usr/lib/python2.4 \
/usr/lib/python2.4/vendor-packages \
/usr/lib/python2.4/vendor-packages/zfs \
/usr/lib/rcap \
/usr/lib/rcap/$(MACH32) \
+ /usr/lib/sa \
/usr/lib/saf \
/usr/lib/sasl \
/usr/lib/scsi \
@@ -307,6 +266,7 @@ ROOT.BIN= \
/usr/lib/zones \
/usr/old \
/usr/openwin \
+ /usr/platform \
/usr/proc \
/usr/proc/bin \
/usr/sadm \
@@ -315,18 +275,29 @@ ROOT.BIN= \
/usr/sadm/install/scripts \
/usr/sadm/sysadm \
/usr/sadm/sysadm/add-ons \
- /usr/snadm \
- /usr/snadm/lib \
/usr/sbin \
/usr/sbin/$(MACH32) \
+ /usr/share \
+ /usr/share/applications \
/usr/share/audio \
/usr/share/audio/samples \
/usr/share/audio/samples/au \
+ /usr/share/gnome \
/usr/share/gnome/autostart \
+ /usr/share/hwdata \
+ /usr/share/lib \
+ /usr/share/lib/ccs \
+ /usr/share/lib/tmac \
+ /usr/share/lib/ldif \
+ /usr/share/lib/xml \
+ /usr/share/lib/xml/dtd \
/usr/share/man \
/usr/share/man/man1m \
+ /usr/share/src \
+ /usr/snadm \
+ /usr/snadm/lib \
/usr/ucb \
- $(MACH32_ROOT.UCB) \
+ $(MACH32_DIRS) \
/usr/ucblib \
/usr/xpg4 \
/usr/xpg4/bin \
@@ -334,20 +305,86 @@ ROOT.BIN= \
/usr/xpg4/lib \
/usr/xpg6 \
/usr/xpg6/bin \
+ /var \
+ /var/adm \
+ /var/adm/exacct \
+ /var/adm/log \
+ /var/adm/pool \
+ /var/adm/sa \
+ /var/adm/sm.bin \
+ /var/adm/streams \
+ /var/cores \
+ /var/cron \
+ /var/db \
+ /var/db/ipf \
/var/games \
+ /var/idmap \
+ /var/krb5 \
+ /var/krb5/rcache \
+ /var/krb5/rcache/root \
/var/ld \
+ /var/log \
+ /var/log/pool \
+ /var/mail \
/var/news \
+ /var/opt \
/var/preserve \
+ /var/run \
/var/saf \
+ /var/sadm \
/var/sadm/install \
/var/sadm/install/admin \
/var/sadm/install/logs \
+ /var/sadm/pkg \
+ /var/sadm/security \
+ /var/smb \
/var/spool \
- /var/spool/pkg
+ /var/spool/cron \
+ /var/spool/cron/atjobs \
+ /var/spool/cron/crontabs \
+ /var/spool/lp \
+ /var/spool/pkg \
+ /var/spool/uucp \
+ /var/spool/uucppublic \
+ /var/svc \
+ /var/svc/log \
+ /var/svc/manifest \
+ /var/svc/manifest/milestone \
+ /var/svc/manifest/device \
+ /var/svc/manifest/system \
+ /var/svc/manifest/system/device \
+ /var/svc/manifest/system/filesystem \
+ /var/svc/manifest/system/security \
+ /var/svc/manifest/system/svc \
+ /var/svc/manifest/network \
+ /var/svc/manifest/network/dns \
+ /var/svc/manifest/network/ipsec \
+ /var/svc/manifest/network/ldap \
+ /var/svc/manifest/network/nfs \
+ /var/svc/manifest/network/nis \
+ /var/svc/manifest/network/rpc \
+ /var/svc/manifest/network/security \
+ /var/svc/manifest/network/shares \
+ /var/svc/manifest/network/ssl \
+ /var/svc/manifest/application \
+ /var/svc/manifest/application/management \
+ /var/svc/manifest/application/security \
+ /var/svc/manifest/application/print \
+ /var/svc/manifest/platform \
+ /var/svc/manifest/platform/sun4u \
+ /var/svc/manifest/platform/sun4v \
+ /var/svc/manifest/site \
+ /var/svc/profile \
+ /var/uucp \
+ /var/tmp \
+ /var/tsol \
+ /var/tsol/doors
-sparcv9_ROOT.BIN64= \
+sparcv9_DIRS64= \
+ /platform/sun4u \
/platform/sun4u/lib \
/platform/sun4u/lib/$(MACH64) \
+ /usr/platform/sun4u \
/usr/platform/sun4u/sbin \
/usr/platform/sun4u/lib \
/platform/sun4v/lib \
@@ -357,11 +394,11 @@ sparcv9_ROOT.BIN64= \
/usr/platform/sun4u-us3/lib \
/usr/platform/sun4u-opl/lib
-amd64_ROOT.BIN64= \
+amd64_DIRS64= \
/platform/i86pc/amd64
-ROOT.BIN64= \
- $($(MACH64)_ROOT.BIN64) \
+DIRS64= \
+ $($(MACH64)_DIRS64) \
/lib/$(MACH64) \
/lib/crypto/$(MACH64) \
/lib/secure/$(MACH64) \
@@ -373,11 +410,15 @@ ROOT.BIN64= \
/usr/lib/brand/sn1/$(MACH64) \
/usr/lib/elfedit/$(MACH64) \
/usr/lib/fm/$(MACH64) \
+ /usr/lib/fs/nfs/$(MACH64) \
+ /usr/lib/fs/smb/$(MACH64) \
/usr/lib/inet/$(MACH64) \
/usr/lib/krb5/$(MACH64) \
/usr/lib/libp/$(MACH64) \
/usr/lib/link_audit/$(MACH64) \
/usr/lib/lwp/$(MACH64) \
+ /usr/lib/mdb/kvm/$(MACH64) \
+ /usr/lib/mdb/proc/$(MACH64) \
/usr/lib/rcap/$(MACH64) \
/usr/lib/sasl/$(MACH64) \
/usr/lib/scsi/$(MACH64) \
@@ -391,120 +432,50 @@ ROOT.BIN64= \
/usr/xpg4/lib/$(MACH64) \
/var/ld/$(MACH64)
-ROOT.OTHER= \
- /usr/share/applications \
- /usr/share/gnome
-
-ROOT.SYS2= \
- /usr/lib/fs \
- /usr/lib/fs/nfs \
- /usr/lib/fs/proc \
- /usr/lib/fs/smb \
- /usr/lib/fs/zfs \
- /usr/lib/mdb \
- /usr/lib/mdb/kvm \
- /usr/lib/mdb/proc \
- /usr/lib/mdb/disasm \
- /usr/lib/nfs \
- /usr/net \
- /usr/net/servers \
- /usr/share/hwdata \
- /usr/share/lib \
- /usr/share/lib/xml \
- /usr/share/lib/xml/dtd \
- /usr/share/src \
- /var/spool/cron \
- /var/spool/cron/atjobs \
- /var/spool/cron/crontabs
-
-sparcv9_ROOT.SYS64.2 = \
- /platform/sun4u \
- /usr/platform/sun4u
-
-amd64_ROOT.SYS64.2 =
-
-ROOT.SYS64.2 = \
- $($(MACH64)_ROOT.SYS64.2) \
- /usr/lib/mdb/kvm/$(MACH64) \
- /usr/lib/mdb/proc/$(MACH64) \
- /usr/lib/fs/nfs/$(MACH64) \
- /usr/lib/fs/smb/$(MACH64)
-
-UUCP.UUCP= \
- /var/spool/uucp \
- /var/spool/uucppublic \
- /var/uucp
-
-OTHERS= \
- /dev/term \
- /tmp \
- /etc/dladm \
- /etc/mail \
- /etc/mail/cf \
- /etc/mail/cf/cf \
- /etc/mail/cf/domain \
- /etc/mail/cf/feature \
- /etc/mail/cf/m4 \
- /etc/mail/cf/mailer \
- /etc/mail/cf/ostype \
- /etc/mail/cf/sh \
- /usr/lib/sa \
- /usr/share/lib/ccs \
- /usr/share/lib/tmac \
- /usr/share/lib/ldif \
- /var/adm/exacct \
- /var/adm/log \
- /var/adm/sa \
- /var/idmap \
- /var/mail \
- /var/spool/lp \
- /var/tmp
-
# /var/mail/:saved is built directly by the rootdirs target in
# /usr/src/Makefile because of the colon in its name.
# macros for symbolic links
-
-SYM.ROOT.SYS= \
+SYM.DIRS= \
+ /bin \
/dev/stdin \
/dev/stdout \
/dev/stderr \
- /usr/adm \
- /usr/lib/cron \
- /usr/man \
- /usr/pub
-
-SYM.ROOT.BIN= \
- /bin \
- /lib/32 \
- /lib/crypto/32 \
- /lib/secure/32 \
/etc/lib/ld.so.1 \
/etc/lib/libdl.so.1 \
/etc/lib/nss_files.so.1 \
+ /etc/log \
+ /lib/32 \
+ /lib/crypto/32 \
+ /lib/secure/32 \
+ /usr/adm \
/usr/spool \
/usr/lib/tmac \
/usr/ccs/lib/link_audit \
/usr/news \
/usr/preserve \
- /usr/src \
/usr/lib/32 \
+ /usr/lib/cron \
/usr/lib/elfedit/32 \
/usr/lib/libp/32 \
/usr/lib/lwp/32 \
/usr/lib/link_audit/32 \
/usr/lib/secure/32 \
- /var/ld/32 \
- /usr/ucblib/32
-
+ /usr/mail \
+ /usr/man \
+ /usr/pub \
+ /usr/src \
+ /usr/tmp \
+ /usr/ucblib/32 \
+ /var/ld/32
-i386_SYM.ROOT.BIN64= \
+i386_SYM.DIRS64= \
/usr/lib/brand/lx/64
-sparc_SYM.ROOT.BIN64=
+sparc_SYM.DIRS64=
-SYM.ROOT.BIN64= \
- $($(MACH)_SYM.ROOT.BIN64) \
+SYM.DIRS64= \
+ $($(MACH)_SYM.DIRS64) \
/lib/64 \
/lib/crypto/64 \
/lib/secure/64 \
@@ -520,11 +491,6 @@ SYM.ROOT.BIN64= \
/var/ld/64 \
/usr/ucblib/64
-SYM.OTHERS= \
- /etc/log \
- /usr/mail \
- /usr/tmp
-
# prepend the ROOT prefix
ROOTDIRS= $(TARGETDIRS:%=$(ROOT)%)
@@ -536,62 +502,12 @@ ROOTDIRS= $(TARGETDIRS:%=$(ROOT)%)
# default values assigned. If a directory is mentioned above and not
# mentioned below, it has default values for attributes.
#
-# The default values for OWNER, GROUP, and DIRMODE are specified in
-# /usr/src/Makefile.master.
+# The default value for DIRMODE is specified in usr/src/Makefile.master.
#
-$(ROOT)/tmp \
-$(ROOT)/usr/tmp \
-$(ROOT)/var/tmp \
-$(ROOT)/var/adm/sa \
-$(ROOT.SYS:%=$(ROOT)%) \
-$(ROOT.SYS2:%=$(ROOT)%) \
-$(ROOT.SYS64.2:%=$(ROOT)%) \
-$(SYM.ROOT.SYS:%=$(ROOT)%):= GROUP= sys
-
-$(ROOT.OTHER:%=$(ROOT)%):= GROUP= other
-
$(ROOT)/var/adm \
$(ROOT)/var/adm/sa := DIRMODE= 775
-$(ROOT)/var/idmap := OWNER= daemon
-$(ROOT)/var/idmap := GROUP= daemon
-
-$(ROOT)/root:= GROUP= root
-
-$(ROOT)/dev/term:= GROUP= root
-
-$(UUCP.UUCP:%=$(ROOT)%):= OWNER= uucp
-$(UUCP.UUCP:%=$(ROOT)%):= GROUP= uucp
-
-$(ROOT)/etc/log \
-$(ROOT)/usr/lib/sa \
-$(ROOT)/var/adm/exacct \
-$(ROOT)/var/adm/log \
-$(ROOT)/var/adm/sa:= OWNER= adm
-
-$(ROOT)/etc/log \
-$(ROOT)/var/adm/exacct \
-$(ROOT)/var/adm/log:= GROUP= adm
-
-$(ROOT)/etc/mail \
-$(ROOT)/etc/mail/cf \
-$(ROOT)/etc/mail/cf/cf \
-$(ROOT)/etc/mail/cf/domain \
-$(ROOT)/etc/mail/cf/feature \
-$(ROOT)/etc/mail/cf/m4 \
-$(ROOT)/etc/mail/cf/mailer \
-$(ROOT)/etc/mail/cf/ostype \
-$(ROOT)/etc/mail/cf/sh \
-$(ROOT)/usr/mail \
-$(ROOT)/var/mail := GROUP= mail
-
-
-$(ROOT)/etc/dladm := OWNER= dladm
-$(ROOT)/etc/dladm := GROUP= sys
-
-$(ROOT)/var/spool/lp:= OWNER= lp
-$(ROOT)/var/spool/lp:= GROUP= lp
$(ROOT)/var/spool/lp:= DIRMODE= 775
# file mode
@@ -624,12 +540,8 @@ $(ROOT)/var/sadm/install/logs := DIRMODE= 555
$(ROOT)/dev/fd \
$(ROOT)/home:= DIRMODE= 555
-$(ROOT)/dev/fd \
-$(ROOT)/home:= GROUP= root
-
$(ROOT)/var/mail:= DIRMODE=1777
-$(ROOT)/proc:= GROUP= root
$(ROOT)/proc:= DIRMODE= 555
$(ROOT)/system/contract:= DIRMODE= 555
@@ -686,10 +598,11 @@ $(BUILD64) $(ROOT)/usr/xpg4/lib/64:= LINKDEST=$(MACH64)
$(BUILD64) $(ROOT)/var/ld/64:= LINKDEST=$(MACH64)
$(BUILD64) $(ROOT)/usr/ucblib/64:= LINKDEST=$(MACH64)
+#
# Installing a directory symlink calls for overriding INS.dir to install
# a symlink.
#
-$(SYMLINKS:%=$(ROOT)%):= \
+$(DIRLINKS:%=$(ROOT)%):= \
INS.dir= -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@
# Special symlinks to populate usr/ccs/lib, whose objects
@@ -856,13 +769,6 @@ SYM.USRCCSLIB64= \
/usr/lib/lwp/$(MACH64)/libthread.so.1 \
/usr/lib/lwp/$(MACH64)/libthread_db.so.1
-
-$(SYM.USRCCSLIB:%=$(ROOT)%):= \
- INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@
-
-$(SYM.USRCCSLIB64:%=$(ROOT)%):= \
- INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@
-
# Special symlinks to direct libraries that have been moved
# from /usr/lib to /lib in order to live in the root filesystem.
$(ROOT)/lib/libposix4.so.1:= REALPATH=librt.so.1
@@ -1892,9 +1798,9 @@ SYM.USRLIB64= \
/usr/lib/$(MACH64)/nss_nisplus.so.1 \
/usr/lib/$(MACH64)/nss_user.so.1
-$(SYM.USRLIB:%=$(ROOT)%):= \
- INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@
-
-$(SYM.USRLIB64:%=$(ROOT)%):= \
+#
+# usr/src/Makefile uses INS.dir for any member of ROOTDIRS, the fact
+# these are symlinks to files has no bearing on this.
+#
+$(FILELINKS:%=$(ROOT)%):= \
INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@
-
View
5 usr/src/cmd/cron/Makefile
@@ -141,12 +141,7 @@ $(XPG6) := CFLAGS += -DXPG6
LINTFLAGS += -u
-$(ROOTSVCSYSTEM)/cron.xml := OWNER = root
-$(ROOTSVCSYSTEM)/cron.xml := GROUP = sys
$(ROOTSVCSYSTEM)/cron.xml := FILEMODE = 0444
-
-$(ROOTLIBSVCMETHOD)/svc-cron := OWNER = root
-$(ROOTLIBSVCMETHOD)/svc-cron := GROUP = bin
$(ROOTLIBSVCMETHOD)/svc-cron := FILEMODE = 0555
View
2 usr/src/cmd/fcoesvc/Makefile
@@ -47,8 +47,6 @@ SVCMETHOD += svc-fcoei
ROOTMANIFESTDIR = $(ROOTSVCSYSTEM)
$(ROOTSVCSYSTEM)/fcoe_target.xml := FILEMODE = 0444
-$(ROOTSVCSYSTEM)/fcoe_initiator.xml := OWNER = root
-$(ROOTSVCSYSTEM)/fcoe_initiator.xml := GROUP = bin
$(ROOTSVCSYSTEM)/fcoe_initiator.xml := FILEMODE = 0444
.KEEP_STATE:
View
2 usr/src/cmd/mdb/Makefile.kmdb
@@ -130,8 +130,6 @@ $(KCTLTGTS) := ASFLAGS += -D_KERNEL
ffs.o ffs.ln := CPPFLAGS += -Dffs=mdb_ffs
-INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@
-
$(ROOTMISC) $(ROOTMISC64) := FILEMODE = 0755
include ../../../Makefile.kmdb.targ
View
5 usr/src/cmd/mdb/intel/amd64/kmdb/Makefile
@@ -19,10 +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"
#
# Build and link kmdb
@@ -96,7 +95,7 @@ kmdb_context_off.h: ../../kmdb/kmdb_context_off.in
#
$(ROOT_MISC_DIR) $(ROOT_MISC_DIR_64):
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(ROOT_MISC_DIR)/%: % $(ROOT_MISC_DIR)
$(INS.file)
View
5 usr/src/cmd/mdb/intel/ia32/kmdb/Makefile
@@ -19,10 +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"
#
# Build and link kmdb
@@ -87,7 +86,7 @@ kmdb_context_off.h: ../../kmdb/kmdb_context_off.in
#
$(ROOT_MISC_DIR) $(ROOT_MISC_DIR_64):
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(ROOT_MISC_DIR)/%: % $(ROOT_MISC_DIR)
$(INS.file)
View
7 usr/src/cmd/mdb/sun4u/v9/kmdb/Makefile
@@ -19,11 +19,10 @@
# 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"
-#
+
all: $(PROG)
@@ -191,7 +190,7 @@ kmdb_context_off.h: ../../../sparc/kmdb/kmdb_context_off.in
#
$(ROOT_MISC_DIR) $(ROOT_MISC_DIR_64):
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(ROOT_MISC_DIR)/%: % $(ROOT_MISC_DIR)
$(INS.file)
View
7 usr/src/cmd/mdb/sun4v/v9/kmdb/Makefile
@@ -20,11 +20,10 @@
#
#
-# 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"
-#
+
all: $(PROG)
@@ -204,7 +203,7 @@ kmdb_context_off.h: ../../../sparc/kmdb/kmdb_context_off.in
#
$(ROOT_MISC_DIR) $(ROOT_MISC_DIR_64):
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(ROOT_MISC_DIR)/%: % $(ROOT_MISC_DIR)
$(INS.file)
View
8 usr/src/cmd/oplhpd/Makefile
@@ -67,16 +67,16 @@ clean:
lint: lint_SRCS
$(USR_PLAT_DIR):
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(USR_PSM_DIR): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(USR_PSM_LIB_DIR): $(USR_PSM_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(USR_PSM_LIB64_DIR): $(USR_PSM_LIB_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(USR_PSM_LIB64_DIR)/%: % $(USR_PSM_LIB64_DIR)
$(INS.file)
View
2 usr/src/cmd/scadm/Makefile.com
@@ -85,7 +85,7 @@ LINKED_SBIN_DIRS = $(PLATLINKS:%=$(USR_PLAT_DIR)/%/sbin)
.PARALLEL: $(OBJS)
$(LINKED_SBIN_DIRS): $(LINKED_DIRS)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
%.o: common/%.c
$(COMPILE.c) -o $@ $<
View
6 usr/src/cmd/sf880drd/Makefile
@@ -56,13 +56,13 @@ clean:
lint: lint_PROG
$(USR_PLAT_DIR):
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(USR_PSM_DIR): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(USR_PSM_LIB_DIR): $(USR_PSM_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR)
$(INS.file)
View
4 usr/src/lib/cfgadm_plugins/Makefile.com
@@ -72,10 +72,10 @@ LINKED_CFG_DIRS = $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/cfgadm)
INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@
$(LINKED_DIRS): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_LIB_DIRS): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_CFG_DIRS): $(USR_PLAT_DIR)
-$(INS.slink6)
View
11 usr/src/lib/cfgadm_plugins/ac/Makefile.com
@@ -35,9 +35,6 @@ OBJECTS= mema.o mema_prom.o mema_test.o mema_test_config.o mema_test_subr.o \
# include library definitions
include $(SRC)/lib/Makefile.lib
-INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@
-INS.dir.root.bin= $(INS) -s -d -m $(DIRMODE) $@
-
USR_PLAT_DIR = $(ROOT)/usr/platform
USR_PSM_DIR = $(USR_PLAT_DIR)/sun4u
USR_PSM_LIB_DIR = $(USR_PSM_DIR)/lib
@@ -64,16 +61,16 @@ lint: lintcheck
# Create target directories
$(USR_PSM_DIR): $(LINKED_DIRS)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(USR_PSM_LIB_DIR): $(USR_PSM_DIR) $(LINKED_LIB_DIRS)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_LIB_CFG_DIR): $(USR_PSM_LIB_DIR) $(LINKED_CFG_DIRS)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_LIB_CFG_DIR_64): $(USR_PSM_LIB_CFG_DIR)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_LIB_CFG_DIR)/%: % $(USR_PSM_LIB_CFG_DIR)
-$(INS.file)
View
8 usr/src/lib/cfgadm_plugins/pci/Makefile.com
@@ -31,8 +31,6 @@ OBJECTS= cfga.o pci_strings.o
include ../../../Makefile.lib
SRCDIR = ../common
-INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@
-INS.dir.bin.bin= $(INS) -s -d -m $(DIRMODE) $@
USR_LIB_DIR = $(ROOT)/usr/lib
USR_LIB_DIR_CFGADM = $(USR_LIB_DIR)/cfgadm
@@ -57,13 +55,13 @@ lint: lintcheck
# Create target directories
$(USR_LIB_DIR):
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(USR_LIB_DIR_CFGADM): $(USR_LIB_DIR)
- -$(INS.dir.bin.bin)
+ -$(INS.dir)
$(USR_LIB_DIR_CFGADM_64): $(USR_LIB_DIR_CFGADM)
- -$(INS.dir.bin.bin)
+ -$(INS.dir)
$(USR_LIB_DIR_CFGADM)/%: % $(USR_LIB_DIR_CFGADM)
-$(INS.file)
View
11 usr/src/lib/cfgadm_plugins/sbd/Makefile.com
@@ -32,9 +32,6 @@ OBJECTS= ap.o ap_msg.o ap_rcm.o ap_sbd.o ap_seq.o cfga.o ap_err.o
# include library definitions
include ../../../Makefile.lib
-INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@
-INS.dir.root.bin= $(INS) -s -d -m $(DIRMODE) $@
-
USR_PLAT_DIR = $(ROOT)/usr/platform
USR_PSM_DIR = $(USR_PLAT_DIR)/sun4u
USR_PSM_LIB_DIR = $(USR_PSM_DIR)/lib
@@ -67,16 +64,16 @@ lint: lintcheck
# Create target directories
$(USR_PSM_DIR):
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(USR_PSM_LIB_DIR): $(USR_PSM_DIR)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_LIB_CFG_DIR): $(USR_PSM_LIB_DIR)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_LIB_CFG_DIR_64): $(USR_PSM_LIB_CFG_DIR)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_LIB_CFG_DIR)/%: % $(USR_PSM_LIB_CFG_DIR)
-$(INS.file)
View
11 usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
@@ -34,9 +34,6 @@ OBJECTS= cfga.o
# include library definitions
include $(SRC)/lib/Makefile.lib
-INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@
-INS.dir.root.bin= $(INS) -s -d -m $(DIRMODE) $@
-
USR_PLAT_DIR = $(ROOT)/usr/platform
USR_PSM_DIR = $(USR_PLAT_DIR)/sun4u
USR_PSM_LIB_DIR = $(USR_PSM_DIR)/lib
@@ -63,16 +60,16 @@ lint: lintcheck
# Create target directories
$(USR_PSM_DIR): $(LINKED_DIRS)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(USR_PSM_LIB_DIR): $(USR_PSM_DIR) $(LINKED_LIB_DIRS)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_LIB_CFG_DIR): $(USR_PSM_LIB_DIR) $(LINKED_CFG_DIRS)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_LIB_CFG_DIR_64): $(USR_PSM_LIB_CFG_DIR)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_LIB_CFG_DIR)/%: % $(USR_PSM_LIB_CFG_DIR)
-$(INS.file)
View
1 usr/src/lib/hbaapi/Makefile.com
@@ -33,7 +33,6 @@ ROOTETC= $(ROOT)/etc
include ../../Makefile.lib
HETCFILES= $(CONFIGFILE:%=$(ROOTETC)/%)
-HETCFILES:= FILEMODE= 644
LIBS = $(DYNLIB) $(LINTLIB)
SRCDIR= ../common
View
4 usr/src/lib/libc_psr/sun4u-opl/Makefile
@@ -54,13 +54,13 @@ all install: lib32 $(BUILD64) lib64 $(LIBC_PSR_LINKS) $(LIBC_PSR64_LINKS)
clean clobber: lib32 $(BUILD64) lib64
$(LIBC_PSR_DIRS):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(LIBC_PSR_LINKS): $(LIBC_PSR_DIRS)
-$(INS.slink6)
$(LIBC_PSR64_DIRS):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(LIBC_PSR64_LINKS): $(LIBC_PSR64_DIRS)
-$(INS.slink7)
View
7 usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile
@@ -19,11 +19,10 @@
# 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"
-#
+
#
# Platform specific Makefile for libc_psr.
@@ -53,7 +52,7 @@ LIBC_PSR_DIR = $(ROOT_PSM_LIB_DIR)
LIBC_PSR_LIB = $(LIBC_PSR_DIR)/$(MODULE)
$(LIBC_PSR_DIRS):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
all: $(LIBS)
View
7 usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile
@@ -19,11 +19,10 @@
# 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"
-#
+
#
# Platform specific Makefile for libc_psr.
@@ -56,7 +55,7 @@ LIBC_PSR64_DIR = $(ROOT_PSM_LIB_DIR)/$(MACH64)
LIBC_PSR64_LIB = $(LIBC_PSR64_DIR)/$(MODULE)
$(LIBC_PSR64_DIRS):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
all: $(LIBS)
View
10 usr/src/lib/libc_psr/sun4u-us3/Makefile
@@ -58,8 +58,6 @@ LINKED_PLATFORMS += SUNW,Sun-Fire-280R
LINKED_PLATFORMS += SUNW,Sun-Fire-15000
LINKED_PLATFORMS += SUNW,Sun-Fire-880
LINKED_PLATFORMS += SUNW,Sun-Fire-480R
-LINKED_PLATFORMS += SUNW,Sun-Fire-V890
-LINKED_PLATFORMS += SUNW,Sun-Fire-V490
LINKED_PLATFORMS += SUNW,Netra-T12
LINKED_PLATFORMS += SUNW,Netra-T4
LINKED_PLATFORMS += SUNW,Netra-CP3010
@@ -67,25 +65,25 @@ LINKED_PLATFORMS += SUNW,Sun-Fire-V215
LINKED_PLATFORMS += SUNW,Sun-Fire-V445
$(ROOT_PSM_LIB_DIR):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(ROOT_PSM_LIB_DIR)/$(MODULE): $(ROOT_PSM_LIB_DIR) $(MODULE)
$(RM) -r $@; $(INS) -s -f $(@D) $(MODULE)
$(ROOT_PSM_LIB64_DIR):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(ROOT_PSM_LIB64_DIR)/$(MODULE): $(ROOT_PSM_LIB64_DIR) $(MODULE)
$(RM) -r $@; $(INS) -s -f $(@D) $(MODULE)
$(LIBC_PSR_DIRS):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(LIBC_PSR_LINKS): $(LIBC_PSR_DIRS)
-$(INS.slink6)
$(LIBC_PSR64_DIRS):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(LIBC_PSR64_LINKS): $(LIBC_PSR64_DIRS)
-$(INS.slink7)
View
2 usr/src/lib/libc_psr/sun4u/sparc/Makefile
@@ -49,7 +49,7 @@ LIBC_PSR_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MODULE))
INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@
$(LIBC_PSR_DIRS):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(LIBC_PSR_LINKS): $(LIBC_PSR_DIRS)
-$(INS.slink6)
View
2 usr/src/lib/libc_psr/sun4u/sparcv9/Makefile
@@ -51,7 +51,7 @@ LIBC_PSR64_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64)/$(MODUL
INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@
$(LIBC_PSR64_DIRS):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(LIBC_PSR64_LINKS): $(LIBC_PSR64_DIRS)
-$(INS.slink6)
View
6 usr/src/lib/libc_psr/sun4u_hwcap1/sparc/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"
-#
#
# Platform specific Makefile for libc_psr_hwcap1.
@@ -53,7 +51,7 @@ LIBC_PSR_LIB = $(LIBC_PSR_DIR)/$(MODULE)
INS.libc = $(RM) -r $@; $(INS) -s -f $(@D) $(MODULE)
$(LIBC_PSR_DIR):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(LIBC_PSR_LIB): $(LIBC_PSR_DIR) $(MODULE)
-$(INS.libc)
View
6 usr/src/lib/libc_psr/sun4u_hwcap1/sparcv9/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"
-#
#
# Platform specific Makefile for libc_psr_hwcap1.
@@ -56,7 +54,7 @@ LIBC_PSR64_LIB = $(LIBC_PSR64_DIR)/$(MODULE)
INS.libc.64 = $(RM) -r $@; $(INS) -s -f $(@D) $(MODULE)
$(LIBC_PSR64_DIR):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(LIBC_PSR64_LIB): $(LIBC_PSR64_DIR) $(MODULE)
-$(INS.libc.64)
View
6 usr/src/lib/libc_psr/sun4u_hwcap2/sparc/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"
-#
#
# Platform specific Makefile for libc_psr_hwcap2.
@@ -53,7 +51,7 @@ LIBC_PSR_LIB = $(LIBC_PSR_DIR)/$(MODULE)
INS.libc = $(RM) -r $@; $(INS) -s -f $(@D) $(MODULE)
$(LIBC_PSR_DIR):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(LIBC_PSR_LIB): $(LIBC_PSR_DIR) $(MODULE)
-$(INS.libc)
View
6 usr/src/lib/libc_psr/sun4u_hwcap2/sparcv9/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"
-#
#
# Platform specific Makefile for libc_psr_hwcap2.
@@ -56,7 +54,7 @@ LIBC_PSR64_LIB = $(LIBC_PSR64_DIR)/$(MODULE)
INS.libc.64 = $(RM) -r $@; $(INS) -f $(@D) $(MODULE)
$(LIBC_PSR64_DIR):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(LIBC_PSR64_LIB): $(LIBC_PSR64_DIR) $(MODULE)
-$(INS.libc.64)
View
8 usr/src/lib/libc_psr/sun4v/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"
-#
include $(SRC)/lib/Makefile.lib
include $(SRC)/Makefile.psm
@@ -40,13 +38,13 @@ TOUCH = /usr/bin/touch
MODULE = libc_psr.so.1
$(ROOT_PSM_LIB_DIR):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(ROOT_PSM_LIB_DIR)/$(MODULE): $(ROOT_PSM_LIB_DIR) $(MODULE)
$(RM) -r $@; $(INS) -s -m $(FILEMODE) -f $(@D) $(MODULE)
$(ROOT_PSM_LIB64_DIR):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(ROOT_PSM_LIB64_DIR)/$(MODULE): $(ROOT_PSM_LIB64_DIR) $(MODULE)
$(RM) -r $@; $(INS) -s -m $(FILEMODE) -f $(@D) $(MODULE)
View
2 usr/src/lib/libc_psr/sun4v_hwcap1/sparc/Makefile
@@ -52,7 +52,7 @@ INS.libc = $(RM) -r $@; $(INS) -s -m $(FILEMODE) -f $(@D) $(MODULE)
$(LIBC_PSR_LIB) := FILEMODE= 0755
$(LIBC_PSR_DIR):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(LIBC_PSR_LIB): $(LIBC_PSR_DIR) $(MODULE)
-$(INS.libc)
View
2 usr/src/lib/libc_psr/sun4v_hwcap1/sparcv9/Makefile
@@ -56,7 +56,7 @@ INS.libc.64 = $(RM) -r $@; $(INS) -m $(FILEMODE) -f $(@D) $(MODULE)
$(LIBC_PSR64_LIB) := FILEMODE= 0755
$(LIBC_PSR64_DIR):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(LIBC_PSR64_LIB): $(LIBC_PSR64_DIR) $(MODULE)
-$(INS.libc.64)
View
2 usr/src/lib/libc_psr/sun4v_hwcap2/sparc/Makefile
@@ -51,7 +51,7 @@ INS.libc = $(RM) -r $@; $(INS) -s -m $(FILEMODE) -f $(@D) $(MODULE)
$(LIBC_PSR_LIB) := FILEMODE= 0755
$(LIBC_PSR_DIR):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(LIBC_PSR_LIB): $(LIBC_PSR_DIR) $(MODULE)
-$(INS.libc)
View
2 usr/src/lib/libc_psr/sun4v_hwcap2/sparcv9/Makefile
@@ -53,7 +53,7 @@ INS.libc.64 = $(RM) -r $@; $(INS) -m $(FILEMODE) -f $(@D) $(MODULE)
$(LIBC_PSR64_LIB) := FILEMODE= 0755
$(LIBC_PSR64_DIR):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(LIBC_PSR64_LIB): $(LIBC_PSR64_DIR) $(MODULE)
-$(INS.libc.64)
View
4 usr/src/lib/libmd/Makefile.com
@@ -105,13 +105,13 @@ INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@
INS.slink64 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@
$(LIBMD_PSR_DIRS):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(LIBMD_PSR_LINKS): $(LIBMD_PSR_DIRS)
-$(INS.slink6)
$(LIBMD_PSR64_DIRS):
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(LIBMD_PSR64_LINKS): $(LIBMD_PSR64_DIRS)
-$(INS.slink64)
View
7 usr/src/lib/libmd/sun4u/Makefile.links
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# lib/libmd/Makefile.sun4u.links
@@ -57,8 +54,6 @@ LINKED_PLATFORMS += SUNW,Sun-Fire-280R
LINKED_PLATFORMS += SUNW,Sun-Fire-15000
LINKED_PLATFORMS += SUNW,Sun-Fire-880
LINKED_PLATFORMS += SUNW,Sun-Fire-480R
-LINKED_PLATFORMS += SUNW,Sun-Fire-V890
-LINKED_PLATFORMS += SUNW,Sun-Fire-V490
LINKED_PLATFORMS += SUNW,Serverblade1
LINKED_PLATFORMS += SUNW,Netra-T12
LINKED_PLATFORMS += SUNW,Netra-T4
View
6 usr/src/lib/libmd/sun4v/sparc/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"
-#
CLASS = 32
PLATFORM = sun4v
@@ -50,6 +48,6 @@ all: $(LIBS)
$(ROOT_PSM_LIB_DIR)/% := FILEMODE = 755
-install: all $(LIBMD_PSR_LINKS) $(ROOT_PSM_LIBS)
+install: all $(ROOT_PSM_LIB_DIR)/$(LIBS)
include $(SRC)/Makefile.psm.targ
View
4 usr/src/lib/libmd/sun4v/sparcv9/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.
#
@@ -50,6 +50,6 @@ all: $(LIBS)
$(ROOT_PSM_LIB64_DIR)/% := FILEMODE = 755
-install: all $(LIBMD_PSR64_LINKS) $(ROOT_PSM_LIB64_DIR)/$(LIBS)
+install: all $(ROOT_PSM_LIB64_DIR)/$(LIBS)
include $(SRC)/Makefile.psm.targ
View
6 usr/src/lib/libpcp/sparc/Makefile
@@ -58,13 +58,13 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR)
$(INS.file)
$(USR_PSM_LIB_DIR):
- $(INS.dir.root.sys)
+ $(INS.dir)
$(LINKED_DIRS): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_LIB_DIRS): $(LINKED_DIRS)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_LIBPCP_DIR): $(USR_PLAT_DIR)
-$(INS.slink7)
View
4 usr/src/lib/libprtdiag_psr/sparc/cherrystone/Makefile
@@ -77,10 +77,10 @@ $(USR_PSM_LIB_DIR):
cd $(UTSBASE)/sun4u/cherrystone; pwd ; $(MAKE) $(USR_PSM_LIB_DIR)
$(LINKED_DIRS): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_LIB_DIRS): $(LINKED_DIRS)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_PRTDIAG_DIRS): $(USR_PLAT_DIR)
-$(INS.slink6)
View
4 usr/src/lib/libprtdiag_psr/sparc/daktari/Makefile
@@ -71,10 +71,10 @@ $(USR_PSM_LIB_DIR):
cd $(UTSBASE)/sun4u/daktari; pwd ; $(MAKE) $(USR_PSM_LIB_DIR)
$(LINKED_DIRS): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_LIB_DIRS): $(LINKED_DIRS)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_PRTDIAG_DIRS): $(USR_PLAT_DIR)
-$(INS.slink6)
View
4 usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile
@@ -91,10 +91,10 @@ $(USR_PSM_LIB_DIR):
$(INS.dir)
$(LINKED_DIRS): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_LIB_DIRS): $(LINKED_DIRS)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_PRTDIAG_DIRS): $(LINKED_LIB_DIRS)
-$(INS.slink6)
View
4 usr/src/lib/libprtdiag_psr/sparc/montecarlo/Makefile
@@ -76,10 +76,10 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR)
$(INS.file)
$(LINKED_DIRS): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_LIB_DIRS): $(LINKED_DIRS)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_PRTDIAG_DIRS): $(LINKED_LIB_DIRS)
-$(INS.slink6)
View
6 usr/src/lib/libprtdiag_psr/sparc/montoya/Makefile
@@ -60,13 +60,13 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR)
$(INS.file)
$(USR_PSM_LIB_DIR):
- $(INS.dir.root.sys)
+ $(INS.dir)
$(LINKED_DIRS): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_LIB_DIRS): $(LINKED_DIRS)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_PRTDIAG_DIRS): $(USR_PLAT_DIR)
-$(INS.slink6)
View
6 usr/src/lib/libprtdiag_psr/sparc/monza/Makefile
@@ -59,13 +59,13 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR)
$(INS.file)
$(USR_PSM_LIB_DIR):
- $(INS.dir.root.sys)
+ $(INS.dir)
$(LINKED_DIRS): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_LIB_DIRS): $(LINKED_DIRS)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_PRTDIAG_DIRS): $(USR_PLAT_DIR)
-$(INS.slink6)
View
6 usr/src/lib/libprtdiag_psr/sparc/ontario/Makefile
@@ -69,13 +69,13 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR)
$(INS.file)
$(USR_PSM_LIB_DIR):
- $(INS.dir.root.sys)
+ $(INS.dir)
$(LINKED_DIRS): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_LIB_DIRS): $(LINKED_DIRS)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_PRTDIAG_DIRS): $(USR_PLAT_DIR)
-$(INS.slink6)
View
4 usr/src/lib/libprtdiag_psr/sparc/schumacher/picl/Makefile
@@ -66,10 +66,10 @@ $(USR_PSM_LIB_DIR):
$(INS.dir)
$(LINKED_DIRS): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_LIB_DIRS): $(LINKED_DIRS)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_PRTDIAG_DIRS): $(USR_PLAT_DIR)
-$(INS.slink6)
View
4 usr/src/lib/librsc/Makefile.com
@@ -78,10 +78,10 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR)
$(INS.file)
$(LINKED_DIRS): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_LIB_DIRS): $(LINKED_DIRS)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_LIBRSC_DIR): $(USR_PLAT_DIR)
-$(INS.slink7)
View
8 usr/src/lib/libtsalarm/sparc/Makefile
@@ -52,19 +52,19 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR)
$(INS.file)
$(USR_PSM_LIB_DIR):
- $(INS.dir.root.sys)
+ $(INS.dir)
$(USR_PSM_INCL_DIR)/%: ../common/% $(USR_PSM_INCL_DIR)
$(INS.file)
$(USR_PSM_INCL_DIR):
- $(INS.dir.root.sys)
+ $(INS.dir)