Skip to content

Commit

Permalink
12471 /usr/share/terminfo compatibility symlink
Browse files Browse the repository at this point in the history
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Yuri Pankov <ypankov@fastmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
  • Loading branch information
nde1 authored and Dan McDonald committed Apr 10, 2020
1 parent 2d43002 commit 150d896
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions usr/src/data/Makefile.data
Expand Up @@ -17,4 +17,5 @@ include $(SRC)/Makefile.master

ROOTETC= $(ROOT)/etc
ROOTLIB= $(ROOT)/usr/lib
ROOTSH= $(ROOT)/usr/share
ROOTSHLIB= $(ROOT)/usr/share/lib
7 changes: 6 additions & 1 deletion usr/src/data/terminfo/Makefile
Expand Up @@ -59,6 +59,8 @@ RELROOTETC= ../usr/share/lib
ROOTLIBSYMLINK= $(ROOTLIB)/tabset
RELROOTLIB= ../share/lib

ROOTSHSYMLINK= $(ROOTSH)/terminfo

ROOTTABSET= $(TABSETSRC:%=$(ROOTTABDIR)/%)

ROOTEXTRATI= $(EXTRATI:%=$(ROOTTERMDIR)/%)
Expand All @@ -82,14 +84,17 @@ $(ROOTSHLIB)/termcap: $(TERMCAPSRC) $(EXTRATC)

install: all $(ROOTTERMDIR) $(ROOTTERMDIR)/s/sun $(ROOTTABDIR) \
$(ROOTTABSET) $(ROOTSHLIB)/termcap $(ROOTSYMLINK) \
$(ROOTLIBSYMLINK) $(ROOTEXTRATI)
$(ROOTLIBSYMLINK) $(ROOTEXTRATI) $(ROOTSHSYMLINK)

$(ROOTSYMLINK):
$(RM) $@; $(SYMLINK) $(RELROOTETC)/termcap $@

$(ROOTLIBSYMLINK):
$(RM) $@; $(SYMLINK) $(RELROOTLIB)/tabset $@

$(ROOTSHSYMLINK):
$(RM) $@; $(SYMLINK) $(RELROOTLIB)/terminfo $@

$(ROOTTERMDIR)/r/%: extras/%.terminfo
TERMINFO=$(ROOTTERMDIR) $(TIC) $< 2>/dev/null

Expand Down
1 change: 1 addition & 0 deletions usr/src/pkg/manifests/system-data-terminfo.mf
Expand Up @@ -2755,3 +2755,4 @@ license lic_CDDL license=lic_CDDL
license usr/src/data/terminfo/THIRDPARTYLICENSE \
license=usr/src/data/terminfo/THIRDPARTYLICENSE
link path=usr/lib/tabset target=../share/lib/tabset
link path=usr/share/terminfo target=../share/lib/terminfo

0 comments on commit 150d896

Please sign in to comment.