--- ./make.tmpl.in.orig	2006-07-07 19:57:41.000000000 +0000
+++ ./make.tmpl.in	2006-07-07 19:58:24.000000000 +0000
@@ -110,7 +110,7 @@
 SUBDIRS.clean := $(SUBDIRS:=.clean)
 SUBDIRS.distclean := $(SUBDIRS:=.distclean)
 
-TARGETS += $(LIB_SHARED) $(LIB_STATIC)
+TARGETS += $(LIB_STATIC)
 
 all: $(SUBDIRS) $(TARGETS)
 
--- ./tools/Makefile.in.orig	2006-04-19 15:33:06.000000000 +0000
+++ ./tools/Makefile.in	2006-07-07 21:25:45.000000000 +0000
@@ -66,11 +66,10 @@
 	vgsplit.c
 
 TARGETS =\
-	.commands \
-	lvm
+	.commands
 
-INSTALL_TARGETS = install_tools_dynamic
-INSTALL_CMDLIB_TARGETS = install_cmdlib_dynamic
+INSTALL_TARGETS =
+INSTALL_CMDLIB_TARGETS =
 
 ifeq ("@STATIC_LINK@", "yes")
   TARGETS += lvm.static
@@ -83,7 +82,7 @@
 CLEAN_TARGETS = liblvm2cmd.so liblvm2cmd.a lvm lvm.static lvm.cflow lvm.xref lvm.tree lvm.rxref lvm.rtree
 
 ifeq ("@CMDLIB@", "yes")
-	TARGETS += liblvm2cmd.so
+	TARGETS += liblvm2cmd.a
 	INSTALL_TARGETS += $(INSTALL_CMDLIB_TARGETS)
 endif
 
@@ -144,7 +143,7 @@
 		$(includedir)/lvm2cmd.h
 
 install_cmdlib_static: liblvm2cmd.a
-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.a \
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 liblvm2cmd.a \
 		$(libdir)/liblvm2cmd.a.$(LIB_VERSION)
 	$(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
 	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
@@ -162,7 +161,7 @@
 	)
 
 install_tools_static: lvm.static
-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 lvm.static \
 		$(staticdir)/lvm.static
 
 install: $(INSTALL_TARGETS)