diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2019-07-04 01:48:24 +0000 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2020-05-04 16:57:13 -0400 |
| commit | cd61ae21816e53b94bc1673f3f1aa651fc3115e8 (patch) | |
| tree | 58f0148e78b6ea4e2e3d64cc45641c9f62d4e574 /usr/src/lib/libcrypt | |
| parent | 241c90a06e8d1708235651863df515a2d522a03a (diff) | |
| download | illumos-gate-cd61ae21816e53b94bc1673f3f1aa651fc3115e8.tar.gz | |
12447 should install library compat symlinks from library makefiles, not Targetdirs
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib/libcrypt')
| -rw-r--r-- | usr/src/lib/libcrypt/Makefile.com | 36 | ||||
| -rw-r--r-- | usr/src/lib/libcrypt/amd64/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/libcrypt/i386/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/libcrypt/sparc/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/libcrypt/sparcv9/Makefile | 5 |
5 files changed, 21 insertions, 26 deletions
diff --git a/usr/src/lib/libcrypt/Makefile.com b/usr/src/lib/libcrypt/Makefile.com index 70b937cb7a..eb4db4b311 100644 --- a/usr/src/lib/libcrypt/Makefile.com +++ b/usr/src/lib/libcrypt/Makefile.com @@ -52,26 +52,24 @@ CERRWARN += $(CNOWARN_UNINIT) all: $(LIBS) -include ../../Makefile.targ +COMPATLINKS = usr/lib/libcrypt_i.so$(VERS) \ + usr/lib/libcrypt_i.so \ + usr/lib/libcrypt_d.so$(VERS) \ + usr/lib/libcrypt_d.so -$(ROOTLINKS) := INS.liblink = \ - $(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@; \ - cd $(ROOTLIBDIR); \ - $(RM) libcrypt_i.so$(VERS) libcrypt_i.so ;\ - $(RM) libcrypt_d.so$(VERS) libcrypt_d.so ;\ - $(SYMLINK) libcrypt.so$(VERS) libcrypt_i.so$(VERS); \ - $(SYMLINK) libcrypt.so libcrypt_i.so; \ - $(SYMLINK) libcrypt.so$(VERS) libcrypt_d.so$(VERS); \ - $(SYMLINK) libcrypt.so libcrypt_d.so; +COMPATLINKS64 = usr/lib/$(MACH64)/libcrypt_i.so$(VERS) \ + usr/lib/$(MACH64)/libcrypt_i.so \ + usr/lib/$(MACH64)/libcrypt_d.so$(VERS) \ + usr/lib/$(MACH64)/libcrypt_d.so -$(ROOTLINKS64) := INS.liblink64 = \ - $(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@; \ - cd $(ROOTLIBDIR64); \ - $(RM) libcrypt_i.so$(VERS) libcrypt_i.so ;\ - $(RM) libcrypt_d.so$(VERS) libcrypt_d.so ;\ - $(SYMLINK) libcrypt.so$(VERS) libcrypt_i.so$(VERS); \ - $(SYMLINK) libcrypt.so libcrypt_i.so; \ - $(SYMLINK) libcrypt.so$(VERS) libcrypt_d.so$(VERS); \ - $(SYMLINK) libcrypt.so libcrypt_d.so; +$(ROOT)/usr/lib/libcrypt_i.so$(VERS) := COMPATLINKTARGET= libcrypt.so$(VERS) +$(ROOT)/usr/lib/libcrypt_i.so := COMPATLINKTARGET= libcrypt.so +$(ROOT)/usr/lib/libcrypt_d.so$(VERS) := COMPATLINKTARGET= libcrypt.so$(VERS) +$(ROOT)/usr/lib/libcrypt_d.so := COMPATLINKTARGET= libcrypt.so +$(ROOT)/usr/lib/$(MACH64)/libcrypt_i.so$(VERS) := COMPATLINKTARGET= libcrypt.so$(VERS) +$(ROOT)/usr/lib/$(MACH64)/libcrypt_i.so := COMPATLINKTARGET= libcrypt.so +$(ROOT)/usr/lib/$(MACH64)/libcrypt_d.so$(VERS) := COMPATLINKTARGET= libcrypt.so$(VERS) +$(ROOT)/usr/lib/$(MACH64)/libcrypt_d.so := COMPATLINKTARGET= libcrypt.so +include ../../Makefile.targ diff --git a/usr/src/lib/libcrypt/amd64/Makefile b/usr/src/lib/libcrypt/amd64/Makefile index 9dbcf2e982..410bdb818e 100644 --- a/usr/src/lib/libcrypt/amd64/Makefile +++ b/usr/src/lib/libcrypt/amd64/Makefile @@ -29,4 +29,4 @@ include ../../Makefile.lib.64 .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcrypt/i386/Makefile b/usr/src/lib/libcrypt/i386/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libcrypt/i386/Makefile +++ b/usr/src/lib/libcrypt/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcrypt/sparc/Makefile b/usr/src/lib/libcrypt/sparc/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libcrypt/sparc/Makefile +++ b/usr/src/lib/libcrypt/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcrypt/sparcv9/Makefile b/usr/src/lib/libcrypt/sparcv9/Makefile index 87ac99efc1..14bdb8486d 100644 --- a/usr/src/lib/libcrypt/sparcv9/Makefile +++ b/usr/src/lib/libcrypt/sparcv9/Makefile @@ -23,11 +23,8 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libcrypt/sparc/Makefile include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) |