cluster: RHEL55 - 2.0.5 library fix from distcvs

Christine Caulfield chrissie at fedoraproject.org
Wed Mar 10 12:06:15 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=90946b7f6b4bd8b4b03560b982bc5ca141d2b374
Commit:        90946b7f6b4bd8b4b03560b982bc5ca141d2b374
Parent:        77cce7cd52503f83e67e6d937183db30b6e47c1e
Author:        Christine Caulfield <ccaulfie at redhat.com>
AuthorDate:    Wed Mar 10 11:34:03 2010 +0000
Committer:     Christine Caulfield <ccaulfie at redhat.com>
CommitterDate: Wed Mar 10 11:34:03 2010 +0000

2.0.5 library fix from distcvs

Signed-off-by: Christine Caulfield <ccaulfie at redhat.com>
---
 cman/cman_tool/Makefile |    2 +-
 cman/configure          |    1 +
 dlm/lib/Makefile        |    2 ++
 dlm/tool/Makefile       |    2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cman/cman_tool/Makefile b/cman/cman_tool/Makefile
index 47a75e6..767361d 100644
--- a/cman/cman_tool/Makefile
+++ b/cman/cman_tool/Makefile
@@ -29,7 +29,7 @@ TARGET=cman_tool
 all: ${TARGET}
 
 cman_tool: main.o join.o ../lib/libcman.a
-	$(CC) $(LDFLAGS) -L$(ccslibdir) -o $@ $^ -L../lib -lccs
+	$(CC) $(LDFLAGS) -L$(ccslibdir) -o $@ $^ -L$(ccsincdir) -lccs
 
 main.o: main.c cman_tool.h
 	$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/cman/configure b/cman/configure
index 681b008..da1a5d5 100755
--- a/cman/configure
+++ b/cman/configure
@@ -102,6 +102,7 @@ if (!$libexecdir) {
 }
 if (!$ccslibdir) {
   $ccslibdir="${libdir}";
+  print "Setting ccslibdir to $ccslibdir\n";
 }
 if (!$mandir) {
   $mandir="${prefix}/usr/share/man";
diff --git a/dlm/lib/Makefile b/dlm/lib/Makefile
index 0cd1b68..b73610e 100644
--- a/dlm/lib/Makefile
+++ b/dlm/lib/Makefile
@@ -38,9 +38,11 @@ $(LIBNAME)_lt.a: libdlm_lt.o
 
 $(LIBNAME).so.${RELEASE_MAJOR}.${RELEASE_MINOR}: libdlm.po libaislock.po
 	$(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname=$(LIBNAME).so.$(RELEASE_MAJOR) $^
+	ln -sf $(LIBNAME).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(LIBNAME).so
 
 $(LIBNAME)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}: libdlm_lt.po
 	$(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname=$(LIBNAME)_lt.so.$(RELEASE_MAJOR) $^
+	ln -sf $(LIBNAME)_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(LIBNAME)_lt.so
 
 %_lt.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/dlm/tool/Makefile b/dlm/tool/Makefile
index 625b456..5a2884c 100644
--- a/dlm/tool/Makefile
+++ b/dlm/tool/Makefile
@@ -14,7 +14,7 @@ top_srcdir=..
 include ${top_srcdir}/make/defines.mk
 
 CFLAGS += -g -I. -I../lib/
-LDFLAGS += -ldlm
+LDFLAGS += -L../lib/ -ldlm
 
 TARGET=dlm_tool
 


More information about the cluster-commits mailing list