1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-17 06:04:23 +03:00

Install symbolic .so links with relative paths between usrlibdir and libdir.

This commit is contained in:
Zdenek Kabelac 2010-04-15 15:12:20 +00:00
parent c474c0827b
commit 5227ae5388
3 changed files with 5 additions and 2 deletions

View File

@ -2,6 +2,7 @@ Version 2.02.64 -
=================================
Added awk script relpath.awk to calculate relative paths.
Fix double DESTDIR usage for infodir and mandir.
Install symbolic .so links with relative paths between usrlibdir and libdir.
Version 2.02.63 - 14th April 2010
=================================

View File

@ -62,6 +62,8 @@ mandir = $(datarootdir)/man
localedir = $(DESTDIR)@LOCALEDIR@
staticdir = $(DESTDIR)@STATICDIR@
udevdir = $(DESTDIR)@udevdir@
USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \
awk -f $(top_srcdir)/scripts/relpath.awk)
# Setup vpath search paths for some suffixes
vpath %.c $(srcdir)
@ -301,7 +303,7 @@ $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
install_lib_shared: $(LIB_SHARED)
$(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
$(INSTALL) -d $(usrlibdir)
$(LN_S) -f $(libdir)/$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
$(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
# FIXME: plugins are currently installed with .so suffix only
install_lib_shared_plugin: $(LIB_SHARED)

View File

@ -169,7 +169,7 @@ install_cmdlib_include: $(srcdir)/lvm2cmd.h
install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
$(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
$(INSTALL) -d $(usrlibdir)
$(LN_S) -f $(libdir)/$<.$(LIB_VERSION) $(usrlibdir)/$(<F)
$(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
install_cmdlib_static: liblvm2cmd-static.a
$(INSTALL_DATA) -D $< $(usrlibdir)/liblvm2cmd.a