Fix dmsetup.static install.

diff --git a/VERSION b/VERSION
index f00885aa4e62619a81868e9b3540ab7b4aaab2ed..f5f1dfd7b827401e5206b1be2c937e6b2c168821 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.00.11-cvs (2004-04-05)
+1.00.12-cvs (2004-04-06)

diff --git a/WHATS_NEW b/WHATS_NEW
index 29bdcc9615efc08d3d3bb31d2c76a5cfd25f2e20..dc0b423d896279386bf6ba47fdd7d7547819fc0f 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,3 +1,7 @@
+Version 1.00.12 - 6 Apr 2004
+===========================
+  Fix dmsetup.static install.
+
 Version 1.00.11 - 5 Apr 2004
 ===========================
   configure --enable-static_link does static build in addition to dynamic.

diff --git a/dmsetup/Makefile.in b/dmsetup/Makefile.in
index d0e6684636e2786e218ee718c77fe9d63255a3be..fa29b83a3b489128670ba49cf29e88bbd88bfc6d 100644 (file)
--- a/dmsetup/Makefile.in
+++ b/dmsetup/Makefile.in
@@ -21,7 +21,7 @@ INSTALL_TYPE = install_dynamic
 
 ifeq ("@STATIC_LINK@", "yes")
   TARGETS += dmsetup.static
-  INSTALL_TYPE += install_dynamic
+  INSTALL_TYPE += install_static
 endif
 
 SOURCES = dmsetup.c
@@ -41,9 +41,11 @@ dmsetup.static: $(OBJECTS) $(interfacedir)/libdevmapper.a
 
 install: $(INSTALL_TYPE)
 
-install_static: $(TARGETS)
+.PHONY: install_dynamic install_static
+
+install_dynamic: dmsetup
        $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
 
-install_dynamic: $(TARGETS)
+install_static: dmsetup.static
        $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
 

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 320a5fa38d3492bc1ca057b21711e7e3bc6640c5..54223f8bb733a1fa04ab0b6357cfed8eb718999f 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -27,7 +27,7 @@ LIB_SHARED = $(interface)/libdevmapper.so
 include ../make.tmpl
 
 .PHONY: install_dynamic install_static \
-       install_@interface@ install_@interface@_static
+       install_fs install_ioctl install_ioctl_static
 
 INSTALL_TYPE = install_dynamic