From 71230a08e490e6cae4d63297b1460503dba1e425 Mon Sep 17 00:00:00 2001 From: Peter Colberg Date: Fri, 30 Oct 2015 14:57:16 -0400 Subject: Fix installation of shared library symlinks Use relative symlinks that are independent of installation prefix. Drop superfluous .so.MAJOR.MINOR symlink, which is and should never be needed in practice. The purpose of shared library symlinks is to provide libraries for compile-time linking (.so) and for run-time linking using the SONAME (.so.MAJOR). --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 61e723a..1d41ba9 100644 --- a/Makefile +++ b/Makefile @@ -44,6 +44,9 @@ all: libutf8proc.a libutf8proc.$(SHLIB_EXT) clean: rm -f utf8proc.o libutf8proc.a libutf8proc.$(SHLIB_VERS_EXT) libutf8proc.$(SHLIB_EXT) test/normtest test/graphemetest test/printproperty test/charwidth test/valid test/iterate +ifneq ($(OS),Darwin) + rm -f libutf8proc.so.$(MAJOR) +endif $(MAKE) -C bench clean $(MAKE) -C data clean @@ -84,10 +87,9 @@ install: libutf8proc.a libutf8proc.$(SHLIB_EXT) libutf8proc.$(SHLIB_VERS_EXT) mkdir -m 755 -p $(DESTDIR)$(libdir) $(INSTALL) -m 644 libutf8proc.a $(DESTDIR)$(libdir) $(INSTALL) -m 755 libutf8proc.$(SHLIB_VERS_EXT) $(DESTDIR)$(libdir) - ln -f -s $(libdir)/libutf8proc.$(SHLIB_VERS_EXT) $(DESTDIR)$(libdir)/libutf8proc.$(SHLIB_EXT) + ln -f -s libutf8proc.$(SHLIB_VERS_EXT) $(DESTDIR)$(libdir)/libutf8proc.$(SHLIB_EXT) ifneq ($(OS),Darwin) - ln -f -s $(libdir)/libutf8proc.$(SHLIB_VERS_EXT) $(DESTDIR)$(libdir)/libutf8proc.so.$(MAJOR) - ln -f -s $(libdir)/libutf8proc.$(SHLIB_VERS_EXT) $(DESTDIR)$(libdir)/libutf8proc.so.$(MAJOR).$(MINOR) + ln -f -s libutf8proc.$(SHLIB_VERS_EXT) $(DESTDIR)$(libdir)/libutf8proc.so.$(MAJOR) endif # Test programs -- cgit v1.2.3