From 25802660123afe4d2693d56783f5d45cc770b020 Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Tue, 6 Apr 2004 12:06:53 +0000 Subject: [PATCH] Fix dmsetup.static install. --- VERSION | 2 +- WHATS_NEW | 4 ++++ dmsetup/Makefile.in | 8 +++++--- lib/Makefile.in | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index f00885a..f5f1dfd 100644 --- 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 29bdcc9..dc0b423 100644 --- 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 d0e6684..fa29b83 100644 --- 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 320a5fa..54223f8 100644 --- 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 -- 2.43.5