diff options
| author | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
| commit | 5b2acc0949194447bba6e45a0fa44d0b5f42f208 (patch) | |
| tree | 7ea9eb87bc68fee386dd39035ce715e87a0e673c /usr/src/lib/libtermcap | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/lib/libtermcap')
| -rw-r--r-- | usr/src/lib/libtermcap/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/lib/libtermcap/Makefile.com | 13 | ||||
| -rw-r--r-- | usr/src/lib/libtermcap/amd64/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/lib/libtermcap/i386/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/libtermcap/sparc/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/libtermcap/sparcv9/Makefile | 4 |
6 files changed, 16 insertions, 10 deletions
diff --git a/usr/src/lib/libtermcap/Makefile b/usr/src/lib/libtermcap/Makefile index dc822135d0..c8a1150c6a 100644 --- a/usr/src/lib/libtermcap/Makefile +++ b/usr/src/lib/libtermcap/Makefile @@ -30,7 +30,6 @@ install := TARGET= install all clean clobber install: $(SUBDIRS) -lint: install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libtermcap/Makefile.com b/usr/src/lib/libtermcap/Makefile.com index 514da01eb8..1a1efeee30 100644 --- a/usr/src/lib/libtermcap/Makefile.com +++ b/usr/src/lib/libtermcap/Makefile.com @@ -13,11 +13,18 @@ # Copyright 2011 Nexenta Systems, Inc. All rights reserved. # +LIBRARY = libtermcap.a +VERS = .1 + # install this library in the root filesystem include ../../Makefile.rootfs -LIBRARY = libtermcap.a -VERS = .1 -LIBS += $(LINTLIB) +COMPATLINKS += usr/ccs/lib/libtermcap.so +COMPATLINKS64 += usr/ccs/lib/$(MACH64)/libtermcap.so + +$(ROOT)/usr/ccs/lib/libtermcap.so := \ + COMPATLINKTARGET=../../../lib/libtermcap.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libtermcap.so := \ + COMPATLINKTARGET=../../../../lib/$(MACH64)/libtermcap.so.1 DYNFLAGS += $(ZLOADFLTR) diff --git a/usr/src/lib/libtermcap/amd64/Makefile b/usr/src/lib/libtermcap/amd64/Makefile index 3e04fa59f3..8ca5b38196 100644 --- a/usr/src/lib/libtermcap/amd64/Makefile +++ b/usr/src/lib/libtermcap/amd64/Makefile @@ -14,9 +14,9 @@ # include $(SRC)/lib/Makefile.filter.com -include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 +include ../Makefile.com -install: $(ROOTLIBS64) $(ROOTLINKS64) +install: $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libtermcap/i386/Makefile b/usr/src/lib/libtermcap/i386/Makefile index e8b506ccb3..552b51a68f 100644 --- a/usr/src/lib/libtermcap/i386/Makefile +++ b/usr/src/lib/libtermcap/i386/Makefile @@ -16,6 +16,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libtermcap/sparc/Makefile b/usr/src/lib/libtermcap/sparc/Makefile index e8b506ccb3..552b51a68f 100644 --- a/usr/src/lib/libtermcap/sparc/Makefile +++ b/usr/src/lib/libtermcap/sparc/Makefile @@ -16,6 +16,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libtermcap/sparcv9/Makefile b/usr/src/lib/libtermcap/sparcv9/Makefile index 3e04fa59f3..8ca5b38196 100644 --- a/usr/src/lib/libtermcap/sparcv9/Makefile +++ b/usr/src/lib/libtermcap/sparcv9/Makefile @@ -14,9 +14,9 @@ # include $(SRC)/lib/Makefile.filter.com -include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 +include ../Makefile.com -install: $(ROOTLIBS64) $(ROOTLINKS64) +install: $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ |