Merge pull request #48 from fsateler/master

Fix install target for new soname scheme
This commit is contained in:
garyscavone
2015-12-02 19:46:50 -05:00

View File

@@ -91,7 +91,6 @@ $(SHAREDLIB) : $(OBJECTS)
$(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
$(CC) $(LDFLAGS) -fPIC @libflags@ $(OBJECT_PATH)/*.o $(LIBS)
$(LN) -s @sharedname@ $(SHAREDLIB)
# $(LN) -s @sharedname@ $(SHAREDLIB).$(MAJOR)
install-headers:
install -d $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk
@@ -99,9 +98,8 @@ install-headers:
install: $(SHAREDLIB) install-headers
install -d $(DESTDIR)$(PREFIX)$(LIBDIR)
install -m 644 $(SHAREDLIB).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)
ln -sf $(SHAREDLIB).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB)
ln -sf $(SHAREDLIB).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB).$(MAJOR)
install -m 644 @sharedname@ $(DESTDIR)$(PREFIX)$(LIBDIR)
ln -sf @sharedname@ $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB)
$(OBJECTS) : Stk.h