31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
|
Fix two issues with installing shared libraries.
|
||
|
|
|
||
|
|
1/ the [[ =~ ]] operator only treats the RHS as a regular expression
|
||
|
|
if it isn't quoted. So we need to remove the quotes.
|
||
|
|
|
||
|
|
2/ The libdmraid-event-* library is not a shared library in the regular
|
||
|
|
sense. i.e. programs are not linked against it and so do not have the
|
||
|
|
library version number encoded in them.
|
||
|
|
Rather, this is a shared-object that is explicitly loaded by dmeventd
|
||
|
|
on request from dmraid. dmraid asks for "libdmraid-event-ism.so", so
|
||
|
|
that is the only name that the shared object should be stored under.
|
||
|
|
Providing a name with a trailing version number just makes it look like
|
||
|
|
something that it is not.
|
||
|
|
|
||
|
|
Signed-off-by: NeilBrown <neilb@suse.de>
|
||
|
|
---
|
||
|
|
lib/Makefile.in | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- dmraid.orig/lib/Makefile.in
|
||
|
|
+++ dmraid/lib/Makefile.in
|
||
|
|
@@ -82,7 +82,7 @@ install_dmraid_libs: $(INSTALL_TARGETS)
|
||
|
|
for f in $(INSTALL_TARGETS); \
|
||
|
|
do \
|
||
|
|
n=$$(basename $${f}) ; \
|
||
|
|
- if [[ "$$n" =~ '.so$$' ]]; then \
|
||
|
|
+ if [[ "$$n" =~ .so$$ && ! "$$n" =~ libdmraid-events-.* ]]; then \
|
||
|
|
$(INSTALL) -m 555 $(STRIP) \
|
||
|
|
$$f $(libdir)/$${n}.@DMRAID_LIB_VERSION@; \
|
||
|
|
$(LN_S) -f $${n}.@DMRAID_LIB_VERSION@ $(libdir)/$${n}; \
|