Ensure shared library is installed correctly and with no SONAME. Put manuals in the right place. Index: src/Makefile.in --- src/Makefile.in.orig +++ src/Makefile.in @@ -42,7 +42,7 @@ srcdir=@srcdir@ bindir=@bindir@ libdir=@libdir@ datarootdir=@datarootdir@ -mandir=@mandir@ +mandir=@prefix@/man mansec=1 lmansec=3 smandir=$(mandir)/man$(mansec) @@ -124,9 +124,7 @@ RUNTIME=$(RUNTIMEDIR)/$(PLLIB) SOEXT=@SO_EXT@ SOLIB=@SOLIB@ SHARED=@PLSO@ -SHAREDV=$(SHARED).$(PLVERSION) -SONAME=@SONAME@ -SONAMEOPT=@SONAMEOPT@ +SHAREDV=$(SHARED).${LIBswipl_VERSION} LIBRARYDIR=${PLBASE}/library PLCUSTOM=${PLBASE}/customize MKLIBS=@MKLIBS@ @@ -254,12 +252,10 @@ $(RUNTIMEDIR)/$(SHARED): dirs $(OBJ) $(LIBOBJ) $(XOBJ) (cd $(RUNTIMEDIR) && $(MSLIBEXE) /def:libswipl.def) else $(RUNTIMEDIR)/$(SHAREDV): dirs $(OBJ) $(LIBOBJ) $(XOBJ) - $(CC) -shared $(COFLAGS) -o $@ $(SONAMEOPT) \ + $(CC) -shared $(COFLAGS) -o $@ \ $(OBJ) $(LIBOBJ) $(XOBJ) $(LDFLAGS) $(LDOFLAGS) $(LIBS) $(RUNTIMEDIR)/$(SHARED): $(RUNTIMEDIR)/$(SHAREDV) - ( cd ../lib/$(PLARCH) && rm -f $(SHARED) && ln -s $(SHAREDV) $(SHARED) ) - ( cd ../lib/$(PLARCH) && rm -f $(SONAME) && ln -s $(SHAREDV) $(SONAME) ) endif endif @@ -521,8 +517,6 @@ ifeq ($(SOEXT),dll) else if [ -f $(RUNTIMEDIR)/$(SHAREDV) ]; then \ $(INSTALL_SHOBJ) $(RUNTIMEDIR)/$(SHAREDV) $(DESTDIR)$(PLBASE)/$(SOLIB)/$(INSTALL_PLARCH) ; \ - ( cd $(DESTDIR)$(PLBASE)/lib/$(INSTALL_PLARCH) && rm -f $(SHARED) && ln -s $(SHAREDV) $(SHARED) ) ; \ - ( cd $(DESTDIR)$(PLBASE)/lib/$(INSTALL_PLARCH) && rm -f $(SONAME) && ln -s $(SHAREDV) $(SONAME) ) ; \ fi endif endif