Mercurial > illumos > illumos-gate
changeset 23:9519c401c703
6278610 SUNW,Sun-Fire-T200 subdirectory creation is bogus
| author | mvgr |
|---|---|
| date | Fri, 17 Jun 2005 05:22:50 -0700 |
| parents | 4a8829a1af2f |
| children | 8cc2334c5289 |
| files | usr/src/lib/libpcp/Makefile.com usr/src/lib/libpcp/sparc/Makefile usr/src/uts/sun4v/ontario/Makefile usr/src/uts/sun4v/ontario/Makefile.ontario usr/src/uts/sun4v/ontario/Makefile.targ |
| diffstat | 5 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/lib/libpcp/Makefile.com Fri Jun 17 02:25:54 2005 -0700 +++ b/usr/src/lib/libpcp/Makefile.com Fri Jun 17 05:22:50 2005 -0700 @@ -56,7 +56,7 @@ LIBS = $(DYNLIB) $(LINTLIB) CFLAGS += $(CCVERBOSE) LDLIBS += -lc -lumem -PLATLIBS = $(USR_PLAT_DIR)/$(PLATFORM)/lib/ +PLATLIBS = $(USR_PLAT_DIR)/$(PLATFORM)/lib INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/libpcp.so.1 $@ $(CHOWNLINK) $(CHGRPLINK) INS.slink7= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/libpcp.so $@ $(CHOWNLINK) $(CHGRPLINK) INS.slink8= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/llib-lpcp.ln $@ $(CHOWNLINK) $(CHGRPLINK)
--- a/usr/src/lib/libpcp/sparc/Makefile Fri Jun 17 02:25:54 2005 -0700 +++ b/usr/src/lib/libpcp/sparc/Makefile Fri Jun 17 05:22:50 2005 -0700 @@ -45,9 +45,6 @@ # install rules # -$(PLATLIBS): - $(INS.dir) - $(PLATLIBS)/libpcp.so: $(RM) -r $@; $(SYMLINK) libpcp.so.1 $@ $(CHOWNLINK) $(CHGRPLINK) @@ -55,7 +52,7 @@ $(INS.file) $(USR_PSM_LIB_DIR): - cd $(UTSBASE)/sun4v; pwd; $(MAKE) $(USR_PSM_LIB_DIR) + $(INS.dir.root.sys) $(LINKED_DIRS): $(USR_PLAT_DIR) -$(INS.dir.root.sys) @@ -72,7 +69,7 @@ $(LINKED_LLIBLPCP_DIR): $(USR_PLAT_DIR) -$(INS.slink8) -install: all $(PLATLIBS) $(USR_PSM_LIBS) $(PLATLIBS)/libpcp.so \ +install: all $(USR_PSM_LIBS) $(PLATLIBS)/libpcp.so \ $(LINKED_DIRS) $(LINKED_LIB_DIRS) \ $(LINKED_LIBPCP_DIR) $(LINKED_LIBPCP1_DIR) \ $(LINKED_LLIBLPCP_DIR)
--- a/usr/src/uts/sun4v/ontario/Makefile Fri Jun 17 02:25:54 2005 -0700 +++ b/usr/src/uts/sun4v/ontario/Makefile Fri Jun 17 05:22:50 2005 -0700 @@ -65,6 +65,7 @@ install: $(ROOT_ONTARIO_DIR) $(USR_ONTARIO_DIR) \ $(USR_ONTARIO_SBIN_DIR) \ + $(USR_ONTARIO_LIB_DIR) \ .WAIT $(ONTARIO_KMODS) modlintlib: $(ONTARIO_KMODS)
--- a/usr/src/uts/sun4v/ontario/Makefile.ontario Fri Jun 17 02:25:54 2005 -0700 +++ b/usr/src/uts/sun4v/ontario/Makefile.ontario Fri Jun 17 05:22:50 2005 -0700 @@ -53,6 +53,7 @@ USR_ONTARIO_DIR = $(USR_PLAT_DIR)/SUNW,Sun-Fire-T200 USR_ONTARIO_SBIN_DIR = $(USR_ONTARIO_DIR)/sbin USR_ONTARIO_INC_DIR = $(USR_ONTARIO_DIR)/include +USR_ONTARIO_LIB_DIR = $(USR_ONTARIO_DIR)/lib USR_ONTARIO_ISYS_DIR = $(USR_ONTARIO_INC_DIR)/sys
--- a/usr/src/uts/sun4v/ontario/Makefile.targ Fri Jun 17 02:25:54 2005 -0700 +++ b/usr/src/uts/sun4v/ontario/Makefile.targ Fri Jun 17 05:22:50 2005 -0700 @@ -72,6 +72,9 @@ $(USR_ONTARIO_SBIN_DIR): $(USR_ONTARIO_DIR) -$(INS.slink5) +$(USR_ONTARIO_LIB_DIR): $(USR_ONTARIO_DIR) + -$(INS.dir.root.bin) + # # Include common targets. #