diff options
| author | Yuri Pankov <yuri.pankov@nexenta.com> | 2018-04-02 05:10:15 +0300 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2018-04-10 09:30:05 -0400 |
| commit | cf798f092f6c8534fa312788d4fb163ac2818718 (patch) | |
| tree | b644009ee9d0deefebca3a6f3867008e3b2da426 /usr/src/uts/sun4u | |
| parent | 3980e3cde6d00569a5e3e416168e6c629b622a5e (diff) | |
| download | illumos-joyent-cf798f092f6c8534fa312788d4fb163ac2818718.tar.gz | |
9431 some sparc platform paths broken after 8685
Reviewed by: Albert Lee <trisk@softnas.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/uts/sun4u')
| -rw-r--r-- | usr/src/uts/sun4u/makaha/Makefile | 46 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/montecarlo/Makefile | 19 |
2 files changed, 33 insertions, 32 deletions
diff --git a/usr/src/uts/sun4u/makaha/Makefile b/usr/src/uts/sun4u/makaha/Makefile index c27f8e89fe..39130fb82b 100644 --- a/usr/src/uts/sun4u/makaha/Makefile +++ b/usr/src/uts/sun4u/makaha/Makefile @@ -65,7 +65,8 @@ install: $(ROOT_MAKAHA_DIR) $(USR_MAKAHA_DIR) \ $(USR_MAKAHA_INC_DIR) \ $(USR_MAKAHA_SBIN_DIR) \ $(USR_MAKAHA_LIB_DIR) \ - $(ROOT_SPUTNIK_DIR) $(USR_SPUTNIK_DIR) \ + $(ROOT_SPUTNIK_DIR) \ + $(USR_SPUTNIK_DIR) \ $(USR_SPUTNIK_INC_DIR) \ $(USR_SPUTNIK_SBIN_DIR) \ $(USR_SPUTNIK_LIB_DIR) \ @@ -74,36 +75,36 @@ install: $(ROOT_MAKAHA_DIR) $(USR_MAKAHA_DIR) \ acebus.conf se.conf scsb.conf \ ttymux_dacf ttymux.conf -acebus.conf: $(ROOT_MAKAHA_DRV_DIR) - -@$(RM) $(ROOT_MAKAHA_DRV_DIR)/$@ +acebus.conf: $(ROOT_MAKAHA_DRV_DIR_32) + -@$(RM) $(ROOT_MAKAHA_DRV_DIR_32)/$@ $(CP) $(UTSBASE)/sun4u/makaha/io/$@ \ - $(ROOT_MAKAHA_DRV_DIR)/$@ - $(CHMOD) $(CFILEMODE) $(ROOT_MAKAHA_DRV_DIR)/$@ + $(ROOT_MAKAHA_DRV_DIR_32)/$@ + $(CHMOD) $(CFILEMODE) $(ROOT_MAKAHA_DRV_DIR_32)/$@ pcf8574: $(ROOT_MAKAHA_DRV_DIR_64) -@$(RM) $(ROOT_MAKAHA_DRV_DIR_64)/$@ $(SYMLINK) $(ROOT_MAKAHA_DRV_LINK_64)/$@ \ $(ROOT_MAKAHA_DRV_DIR_64)/$@ -acebus: $(ROOT_MAKAHA_DRV_DIR_64) +acebus: $(ROOT_MAKAHA_DRV_DIR_64) -@$(RM) $(ROOT_MAKAHA_DRV_DIR_64)/$@ $(SYMLINK) $(ROOT_MAKAHA_DRV_LINK_64)/$@ \ $(ROOT_MAKAHA_DRV_DIR_64)/$@ -scsb: $(ROOT_MAKAHA_DRV_DIR_64) +scsb: $(ROOT_MAKAHA_DRV_DIR_64) -@$(RM) $(ROOT_MAKAHA_DRV_DIR_64)/$@ $(SYMLINK) $(ROOT_MAKAHA_DRV_LINK_64)/$@ \ $(ROOT_MAKAHA_DRV_DIR_64)/$@ -scsb.conf: $(ROOT_MAKAHA_DRV_DIR) - -@$(RM) $(ROOT_MAKAHA_DRV_DIR)/$@ - $(SYMLINK) $(ROOT_MAKAHA_DRV_LINK)/$@ \ - $(ROOT_MAKAHA_DRV_DIR)/$@ +scsb.conf: $(ROOT_MAKAHA_DRV_DIR_32) + -@$(RM) $(ROOT_MAKAHA_DRV_DIR_32)/$@ + $(SYMLINK) $(ROOT_MAKAHA_DRV_LINK_32)/$@ \ + $(ROOT_MAKAHA_DRV_DIR_32)/$@ -se.conf: $(ROOT_MAKAHA_DRV_DIR) - -@$(RM) $(ROOT_MAKAHA_DRV_DIR)/$@ - $(SYMLINK) $(ROOT_MAKAHA_DRV_LINK)/$@ \ - $(ROOT_MAKAHA_DRV_DIR)/$@ +se.conf: $(ROOT_MAKAHA_DRV_DIR_32) + -@$(RM) $(ROOT_MAKAHA_DRV_DIR_32)/$@ + $(SYMLINK) $(ROOT_MAKAHA_DRV_LINK_32)/$@ \ + $(ROOT_MAKAHA_DRV_DIR_32)/$@ ttymux_dacf: $(ROOT_MAKAHA_DACF_DIR_64) \ $(ROOT_SPUTNIK_DACF_DIR_64) @@ -115,14 +116,13 @@ ttymux_dacf: $(ROOT_MAKAHA_DACF_DIR_64) \ $(ROOT_SPUTNIK_DACF_DIR_64)/$@ -ttymux.conf: $(ROOT_MAKAHA_DRV_DIR) \ - $(ROOT_SPUTNIK_DRV_DIR) - -@$(RM) $(ROOT_MAKAHA_DRV_DIR)/$@ - -@$(RM) $(ROOT_SPUTNIK_DRV_DIR)/$@ - $(SYMLINK) $(ROOT_MAKAHA_DRV_LINK)/$@ \ - $(ROOT_MAKAHA_DRV_DIR)/$@ - $(SYMLINK) $(ROOT_MAKAHA_DRV_LINK)/$@ \ - $(ROOT_SPUTNIK_DRV_DIR)/$@ +ttymux.conf: $(ROOT_MAKAHA_DRV_DIR_32) $(ROOT_SPUTNIK_DRV_DIR_32) + -@$(RM) $(ROOT_MAKAHA_DRV_DIR_32)/$@ + -@$(RM) $(ROOT_SPUTNIK_DRV_DIR_32)/$@ + $(SYMLINK) $(ROOT_MAKAHA_DRV_LINK_32)/$@ \ + $(ROOT_MAKAHA_DRV_DIR_32)/$@ + $(SYMLINK) $(ROOT_MAKAHA_DRV_LINK_32)/$@ \ + $(ROOT_SPUTNIK_DRV_DIR_32)/$@ install_h check: diff --git a/usr/src/uts/sun4u/montecarlo/Makefile b/usr/src/uts/sun4u/montecarlo/Makefile index ee28e01cbc..6c0dd673c7 100644 --- a/usr/src/uts/sun4u/montecarlo/Makefile +++ b/usr/src/uts/sun4u/montecarlo/Makefile @@ -59,24 +59,25 @@ def all clean.lint clean clobber modlist: $(MONTECARLO_KMODS) modlintlib: $(MONTECARLO_KMODS) -install: $(ROOT_MONTECARLO_DIR) $(USR_MONTECARLO_DIR) \ +install: $(ROOT_MONTECARLO_DIR) \ + $(USR_MONTECARLO_DIR) \ $(USR_MONTECARLO_INC_DIR) \ $(USR_MONTECARLO_SBIN_DIR) \ $(USR_MONTECARLO_LIB_DIR) \ .WAIT $(MONTECARLO_KMODS) \ se.conf ttymux.conf -se.conf: $(ROOT_MONTECARLO_DRV_DIR) - -@$(RM) $(ROOT_MONTECARLO_DRV_DIR)/$@ +se.conf: $(ROOT_MONTECARLO_DRV_DIR_32) + -@$(RM) $(ROOT_MONTECARLO_DRV_DIR_32)/$@ $(CP) $(UTSBASE)/sun4u/montecarlo/io/$@ \ - $(ROOT_MONTECARLO_DRV_DIR)/$@ - $(CHMOD) $(CFILEMODE) $(ROOT_MONTECARLO_DRV_DIR)/$@ + $(ROOT_MONTECARLO_DRV_DIR_32)/$@ + $(CHMOD) $(CFILEMODE) $(ROOT_MONTECARLO_DRV_DIR_32)/$@ -ttymux.conf: $(ROOT_MONTECARLO_DRV_DIR) - -@$(RM) $(ROOT_MONTECARLO_DRV_DIR)/$@ +ttymux.conf: $(ROOT_MONTECARLO_DRV_DIR_32) + -@$(RM) $(ROOT_MONTECARLO_DRV_DIR_32)/$@ $(CP) $(UTSBASE)/sun4u/montecarlo/io/$@ \ - $(ROOT_MONTECARLO_DRV_DIR)/$@ - $(CHMOD) $(CFILEMODE) $(ROOT_MONTECARLO_DRV_DIR)/$@ + $(ROOT_MONTECARLO_DRV_DIR_32)/$@ + $(CHMOD) $(CFILEMODE) $(ROOT_MONTECARLO_DRV_DIR_32)/$@ install_h check: FRC @cd sys; pwd; $(MAKE) $(TARGET) |