--- cman-2.0.66/dlm/tool/Makefile.libraryfix	2007-06-05 13:27:27.000000000 -0500
+++ cman-2.0.66/dlm/tool/Makefile	2007-06-19 17:32:16.000000000 -0500
@@ -14,7 +14,7 @@
 include ${top_srcdir}/make/defines.mk
 
 CFLAGS += -g -I. -I../lib/
-LDFLAGS += -ldlm
+LDFLAGS += -L../lib/ -ldlm
 
 TARGET=dlm_tool
 
--- cman-2.0.66/dlm/lib/Makefile.libraryfix	2007-06-19 17:37:08.000000000 -0500
+++ cman-2.0.66/dlm/lib/Makefile	2007-06-19 17:38:08.000000000 -0500
@@ -38,9 +38,11 @@
 
 $(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 $@ $<
--- cman-2.0.66/cman/configure.libraryfix	2006-08-11 10:18:04.000000000 -0500
+++ cman-2.0.66/cman/configure	2007-06-19 17:32:16.000000000 -0500
@@ -102,6 +102,7 @@
 }
 if (!$ccslibdir) {
   $ccslibdir="${libdir}";
+  print "Setting ccslibdir to $ccslibdir\n";
 }
 if (!$mandir) {
   $mandir="${prefix}/usr/share/man";
--- cman-2.0.66/cman/cman_tool/Makefile.libraryfix	2006-08-11 10:18:04.000000000 -0500
+++ cman-2.0.66/cman/cman_tool/Makefile	2007-06-19 17:32:16.000000000 -0500
@@ -29,7 +29,7 @@
 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 $@ $<