--- libtomcrypt-1.06/testprof/makefile.shared.orig	2005-08-01 11:33:58.000000000 -0600
+++ libtomcrypt-1.06/testprof/makefile.shared	2006-03-03 12:36:58.000000000 -0600
@@ -14,7 +14,9 @@
 default: $(LIBTEST)
 
 $(LIBTEST): $(OBJECTS)
-	libtool --silent --mode=link gcc $(CFLAGS) `find . -type f | grep "[.]lo" |  xargs` -o $@ -rpath $(LIBPATH) -version-info $(VERSION)
-	libtool --silent --mode=link gcc $(CFLAGS) `find . -type f | grep "[.]o" | xargs`  -o $(LIBTEST_S)
-	ranlib $(LIBTEST_S)
-	libtool --silent --mode=install install -c $@ $(LIBPATH)/$@
+	libtool --silent --mode=link --tag=CC gcc $(CFLAGS) `find . -type f | grep "[.]lo" |  xargs` -o $@ -rpath $(LIBPATH) -version-info $(VERSION)
+	libtool --silent --mode=link --tag=CC gcc $(CFLAGS) `find . -type f | grep "[.]o" | xargs`  -o $(LIBTEST_S)
+
+install: $(LIBTEST)
+	install -d $(DESTDIR)$(LIBPATH)
+	libtool --silent --mode=install install -c $(LIBTEST) $(DESTDIR)$(LIBPATH)/$(LIBTEST)
--- libtomcrypt-1.06/makefile.shared.orig	2006-03-03 12:36:50.000000000 -0600
+++ libtomcrypt-1.06/makefile.shared	2006-03-03 12:37:57.000000000 -0600
@@ -206,11 +206,13 @@
 	cd testprof ; CFLAGS="$(CFLAGS)" GROUP=$(GROUP) USER=$(USER) VERSION=$(VERSION) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) make -f makefile.shared
 
 $(LIBNAME): $(OBJECTS) testprof/$(LIBTEST)
-	libtool --silent --mode=link gcc $(CFLAGS) `find . -type f | grep "[.]lo" | grep "src/" | xargs` $(EXTRALIBS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
-	libtool --silent --mode=link gcc $(CFLAGS) `find . -type f | grep "[.]o" | grep "src/" | xargs`  $(EXTRALIBS) -o $(LIBNAME_S)
-	ranlib $(LIBNAME_S)
-	libtool --silent --mode=install install -c libtomcrypt.la $(LIBPATH)/libtomcrypt.la
+	libtool --silent --mode=link --tag=CC gcc $(CFLAGS) `find . -type f | grep "[.]lo" | grep "src/" | xargs` $(EXTRALIBS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
+	libtool --silent --mode=link --tag=CC gcc $(CFLAGS) `find . -type f | grep "[.]o" | grep "src/" | xargs`  $(EXTRALIBS) -o $(LIBNAME_S)
+
+install: $(LIBNAME)
+	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
 	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
+	libtool --silent --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME)
 	install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
 
 #This rule makes the hash program included with libtomcrypt