summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
authorNick Ewins <nick@krypton.computer>2020-04-09 20:38:37 +0000
committerDan McDonald <danmcd@joyent.com>2020-04-10 10:44:34 -0400
commit150d89609dfbc94f5333c83d572645defa78929f (patch)
tree603e595d429bb5ab1f9f579326090c2dab43a25f /usr
parent2d43002e153b12554804eace495c8ecfa0b88f52 (diff)
downloadillumos-joyent-150d89609dfbc94f5333c83d572645defa78929f.tar.gz
12471 /usr/share/terminfo compatibility symlink
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>
Diffstat (limited to 'usr')
-rw-r--r--usr/src/data/Makefile.data1
-rw-r--r--usr/src/data/terminfo/Makefile7
-rw-r--r--usr/src/pkg/manifests/system-data-terminfo.mf1
3 files changed, 8 insertions, 1 deletions
diff --git a/usr/src/data/Makefile.data b/usr/src/data/Makefile.data
index 946bb97cbd..69fe8a3dd6 100644
--- a/usr/src/data/Makefile.data
+++ b/usr/src/data/Makefile.data
@@ -17,4 +17,5 @@ include $(SRC)/Makefile.master
ROOTETC= $(ROOT)/etc
ROOTLIB= $(ROOT)/usr/lib
+ROOTSH= $(ROOT)/usr/share
ROOTSHLIB= $(ROOT)/usr/share/lib
diff --git a/usr/src/data/terminfo/Makefile b/usr/src/data/terminfo/Makefile
index 9f5d90c30d..4b130939ca 100644
--- a/usr/src/data/terminfo/Makefile
+++ b/usr/src/data/terminfo/Makefile
@@ -59,6 +59,8 @@ RELROOTETC= ../usr/share/lib
ROOTLIBSYMLINK= $(ROOTLIB)/tabset
RELROOTLIB= ../share/lib
+ROOTSHSYMLINK= $(ROOTSH)/terminfo
+
ROOTTABSET= $(TABSETSRC:%=$(ROOTTABDIR)/%)
ROOTEXTRATI= $(EXTRATI:%=$(ROOTTERMDIR)/%)
@@ -82,7 +84,7 @@ $(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 $@
@@ -90,6 +92,9 @@ $(ROOTSYMLINK):
$(ROOTLIBSYMLINK):
$(RM) $@; $(SYMLINK) $(RELROOTLIB)/tabset $@
+$(ROOTSHSYMLINK):
+ $(RM) $@; $(SYMLINK) $(RELROOTLIB)/terminfo $@
+
$(ROOTTERMDIR)/r/%: extras/%.terminfo
TERMINFO=$(ROOTTERMDIR) $(TIC) $< 2>/dev/null
diff --git a/usr/src/pkg/manifests/system-data-terminfo.mf b/usr/src/pkg/manifests/system-data-terminfo.mf
index be3b79044d..67c7e7be27 100644
--- a/usr/src/pkg/manifests/system-data-terminfo.mf
+++ b/usr/src/pkg/manifests/system-data-terminfo.mf
@@ -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