--- opal-2.1.3/Makefile.in.libname 2006-02-01 23:45:40.000000000 +0100 +++ opal-2.1.3/Makefile.in 2006-02-15 15:37:19.000000000 +0100 @@ -678,7 +678,7 @@ ifeq ($(BUILD_TYPE),.) LIBNAME_PAT = $(LIBNAME_MIN).$(BUILD_NUMBER) else - LIBNAME_PAT = $(LIBNAME_MIN)-$(BUILD_TYPE)$(BUILD_NUMBER) + LIBNAME_PAT = $(LIBNAME_MIN) endif else LIBNAME_MAJ = $(subst .$(LIB_SUFFIX),.$(MAJOR_VERSION).$(LIB_SUFFIX),$(OPAL_FILE)) @@ -690,7 +690,7 @@ endif endif -LIB_SONAME = $(LIBNAME_MIN) +LIB_SONAME = $(LIBNAME_MAJ) CLEAN_FILES += $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(OPAL_FILE) $(LIBDIR)/$(LIBNAME_MAJ) $(LIBDIR)/$(LIBNAME_MIN) @@ -757,9 +757,9 @@ endif $(LIBDIR)/$(OPAL_FILE): $(LIBDIR)/$(LIBNAME_PAT) - cd $(LIBDIR) ; rm -f $(OPAL_FILE) ; ln -sf $(LIBNAME_PAT) $(OPAL_FILE) +# cd $(LIBDIR) ; rm -f $(OPAL_FILE) ; ln -sf $(LIBNAME_PAT) $(OPAL_FILE) cd $(LIBDIR) ; rm -f $(LIBNAME_MAJ) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MAJ) - cd $(LIBDIR) ; rm -f $(LIBNAME_MIN) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MIN) +# cd $(LIBDIR) ; rm -f $(LIBNAME_MIN) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MIN) $(LIBDIR)/$(LIBNAME_PAT): $(STATIC_LIB_FILE) @echo EXTLIBS = $(EXTLIBS) @@ -876,12 +876,12 @@ do mkdir -p $$dir ; chmod 755 $$dir ; \ done) $(INSTALL) -m 755 lib/$(LIBNAME_PAT) $(DESTDIR)@LIBDIR@ - ln -snf $(LIBNAME_PAT) \ - $(DESTDIR)@LIBDIR@/$(OPAL_FILE).$(MAJOR_VERSION).$(MINOR_VERSION) +# ln -snf $(LIBNAME_PAT) \ +# $(DESTDIR)@LIBDIR@/$(OPAL_FILE).$(MAJOR_VERSION).$(MINOR_VERSION) ln -snf $(LIBNAME_PAT) \ $(DESTDIR)@LIBDIR@/$(OPAL_FILE).$(MAJOR_VERSION) - ln -snf $(LIBNAME_PAT) \ - $(DESTDIR)@LIBDIR@/$(OPAL_FILE) +# ln -snf $(LIBNAME_PAT) \ +# $(DESTDIR)@LIBDIR@/$(OPAL_FILE) ln -snf $(LIBNAME_PAT) \ $(DESTDIR)@LIBDIR@/libopal.so ( for fn in include/asn/*.h ; do \ --- opal-2.1.3/opal_inc.mak.in.libname 2006-01-31 09:10:37.000000000 +0100 +++ opal-2.1.3/opal_inc.mak.in 2006-02-15 14:55:00.000000000 +0100 @@ -103,7 +103,7 @@ endif -OPAL_BASE = opal_$(PLATFORM_TYPE)_$(OPAL_SUFFIX) +OPAL_BASE = opal OPAL_FILE = lib$(OPAL_BASE)$(LIB_TYPE).$(LIB_SUFFIX) LDFLAGS += -L$(OPAL_LIBDIR)