INSTALL rules updates

Patch is inspired by Debian's extra patch.

- removes OWNER & GROUP make vars they are parts of INSTALL command.
- adds INSTALL_PROGRAM for executable, uses $(INSTALL)
- adds INSTALL_DATA for non-executable data, uses ($INSTALL)
- adds INSTALL_WDATA for writable non-executable data, uses ($INSTALL)
- adds configure option --enable-write_install - to support
  installatin of writable files used by distribution
- replaces usage of ifeq @LIB_SUFFIX@ with $(LIB_SUFFIX)
- installs .a files from static builds without executable flag
- installs .a files to $(usrlibdir) instead of $(libdir)
- installs all static binaries to $(staticdir)
- create .so links for devel package in $(usrlibdir) instead of
  $(libdir)
- makes .so and .so.LIB_VERSION files within builddir
- removes VERSIONED_SHLIB and created versioned LIB_SHARED automagicaly
- install LIB_SHARED via install_lib_shared target
- install plugins via install_lib_shared_plugin target
- prints whole 'install' command during installation instead of less
  informative "Installing  $(something) $(somewhere)"
- install multiple man pages with one INSTALL command
- use DISTCLEAN_TARGETS instead of creating multiple distclean targets

diff --git a/WHATS_NEW b/WHATS_NEW
index 257ace5a30004262896db2644a23f86d454581f9..f3c7411041dbd8c57a24715ac813c696ee472e28 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,8 @@
 Version 2.02.63 -  
 ================================
+  Install .a .so links to $(usrlibdir).
+  Add --enable-write_install options to install user writable files.
+  Use INSTALL_PROGRAM/DATA/WDATA target.
   Switch from using VPATH  to vpath in Makefiles.
   Permit mimage LVs to be striped in lvcreate and lvresize.
   Fix pvmove allocation to take existing parallel stripes into account.

diff --git a/configure b/configure
index 08895a516591e08c15ad4ae6a590922b93188934..3c8c9a628d052a11c039a3be64cb6536ca299f2e 100755 (executable)
--- a/configure
+++ b/configure
@@ -646,6 +646,7 @@ kernelvsn
 missingkernel
 kerneldir
 interface
+WRITE_INSTALL
 UDEV_SYNC
 UDEV_RULES
 UDEV_LIBS
@@ -657,7 +658,6 @@ READLINE_LIBS
 PTHREAD_LIBS
 POOL
 PKGCONFIG
-OWNER
 MIRRORS
 LVM_RELEASE_DATE
 LVM_RELEASE
@@ -676,7 +676,6 @@ INTL_PACKAGE
 INTL
 HAVE_REALTIME
 HAVE_LIBDL
-GROUP
 FSADM
 DM_LIB_PATCHLEVEL
 DM_LIB_VERSION
@@ -836,6 +835,7 @@ enable_o_direct
 enable_applib
 enable_cmdlib
 enable_pkgconfig
+enable_write_install
 enable_fsadm
 enable_dmeventd
 enable_selinux
@@ -1527,6 +1527,7 @@ Optional Features:
   --enable-applib         Build application library
   --enable-cmdlib         Build shared command library
   --enable-pkgconfig      Install pkgconfig support
+  --enable-write_install  Install user writable files
   --disable-fsadm         Disable fsadm
   --enable-dmeventd       Enable the device-mapper event daemon
   --disable-selinux       Disable selinux support
@@ -9083,8 +9084,6 @@ $as_echo "$STATIC_LINK" >&6; }
 ################################################################################
 { $as_echo "$as_me:$LINENO: checking file owner" >&5
 $as_echo_n "checking file owner... " >&6; }
-OWNER=""
-
 
 # Check whether --with-user was given.
 if test "${with_user+set}" = set; then
@@ -9095,13 +9094,12 @@ fi
 $as_echo "$OWNER" >&6; }
 
 if test x$OWNER != x; then
-       OWNER="-o $OWNER"
+       INSTALL="$INSTALL -o $OWNER"
 fi
 
 ################################################################################
 { $as_echo "$as_me:$LINENO: checking group owner" >&5
 $as_echo_n "checking group owner... " >&6; }
-GROUP=""
 
 # Check whether --with-group was given.
 if test "${with_group+set}" = set; then
@@ -9112,7 +9110,7 @@ fi
 $as_echo "$GROUP" >&6; }
 
 if test x$GROUP != x; then
-       GROUP="-g $GROUP"
+       INSTALL="$INSTALL -g $GROUP"
 fi
 
 ################################################################################
@@ -12450,6 +12448,15 @@ else
 fi
 
 
+################################################################################
+# Check whether --enable-write_install was given.
+if test "${enable_write_install+set}" = set; then
+  enableval=$enable_write_install; WRITE_INSTALL=$enableval
+else
+  WRITE_INSTALL=no
+fi
+
+
 ################################################################################
 { $as_echo "$as_me:$LINENO: checking whether to install fsadm" >&5
 $as_echo_n "checking whether to install fsadm... " >&6; }
@@ -15600,7 +15607,6 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'`
 
 
 
-
 
 
 ################################################################################

diff --git a/configure.in b/configure.in
index ede1a7404fcc7385ad79cd07082ec4c4acc2c1e0..ed9e631dd124d68976f2656cddc45a5922bb1edd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -144,28 +144,25 @@ AC_PREFIX_DEFAULT(/usr)
 ################################################################################
 dnl -- Setup the ownership of the files
 AC_MSG_CHECKING(file owner)
-OWNER=""
-
 AC_ARG_WITH(user,
   [  --with-user=USER        Set the owner of installed files [[USER=]] ],
   [ OWNER="$withval" ])
 AC_MSG_RESULT($OWNER)
 
 if test x$OWNER != x; then
-       OWNER="-o $OWNER"
+       INSTALL="$INSTALL -o $OWNER"
 fi
 
 ################################################################################
 dnl -- Setup the group ownership of the files
 AC_MSG_CHECKING(group owner)
-GROUP=""
 AC_ARG_WITH(group,
   [  --with-group=GROUP      Set the group owner of installed files [[GROUP=]] ],
   [ GROUP="$withval" ])
 AC_MSG_RESULT($GROUP)
 
 if test x$GROUP != x; then
-       GROUP="-g $GROUP"
+       INSTALL="$INSTALL -g $GROUP"
 fi
 
 ################################################################################
@@ -732,6 +729,12 @@ dnl -- Enable pkg-config
 AC_ARG_ENABLE(pkgconfig,   [  --enable-pkgconfig      Install pkgconfig support],
   PKGCONFIG=$enableval, PKGCONFIG=no)
 
+################################################################################
+dnl -- Enable installation of writable files by user
+AC_ARG_ENABLE(write_install, AC_HELP_STRING([--enable-write_install],
+       [Install user writable files]), 
+       [WRITE_INSTALL=$enableval], [WRITE_INSTALL=no])
+
 ################################################################################
 dnl -- Enable fsadm
 AC_MSG_CHECKING(whether to install fsadm)
@@ -1080,7 +1083,6 @@ AC_SUBST(DM_IOCTLS)
 AC_SUBST(DM_LIB_VERSION)
 AC_SUBST(DM_LIB_PATCHLEVEL)
 AC_SUBST(FSADM)
-AC_SUBST(GROUP)
 AC_SUBST(GULM_CFLAGS)
 AC_SUBST(GULM_LIBS)
 AC_SUBST(HAVE_LIBDL)
@@ -1103,7 +1105,6 @@ AC_SUBST(LVM_RELEASE)
 AC_SUBST(LVM_RELEASE_DATE)
 AC_SUBST(MIRRORS)
 AC_SUBST(MSGFMT)
-AC_SUBST(OWNER)
 AC_SUBST(PKGCONFIG)
 AC_SUBST(POOL)
 AC_SUBST(PTHREAD_LIBS)
@@ -1121,6 +1122,7 @@ AC_SUBST(STATIC_LINK)
 AC_SUBST(UDEV_LIBS)
 AC_SUBST(UDEV_RULES)
 AC_SUBST(UDEV_SYNC)
+AC_SUBST(WRITE_INSTALL)
 AC_SUBST(interface)
 AC_SUBST(kerneldir)
 AC_SUBST(missingkernel)

diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in
index 773c3689dc20161b8194e15d12d438ebd2079261..ee19e6ceb14aee744e06cebd5330c833f0ccd375 100644 (file)
--- a/daemons/clvmd/Makefile.in
+++ b/daemons/clvmd/Makefile.in
@@ -110,8 +110,7 @@ clvmd: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a
 .PHONY: install_clvmd
 
 install_clvmd: $(TARGETS)
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) clvmd \
-               $(usrsbindir)/clvmd
+       $(INSTALL_PROGRAM) -D clvmd $(usrsbindir)/clvmd
 
 install: $(INSTALL_TARGETS)
 

diff --git a/daemons/cmirrord/Makefile.in b/daemons/cmirrord/Makefile.in
index 583c4549d88f73b33a3dad22cae938c8c1066571..0efc8d4af9cfc340a1b32476c6e9d5a167600bfb 100644 (file)
--- a/daemons/cmirrord/Makefile.in
+++ b/daemons/cmirrord/Makefile.in
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2009-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -31,9 +31,8 @@ LMLIBS += $(CPG_LIBS) $(SACKPT_LIBS)
 CFLAGS += $(CPG_CFLAGS) $(SACKPT_CFLAGS)
 
 cmirrord: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a
-       $(CC) $(CFLAGS) $(LDFLAGS) -o cmirrord $(OBJECTS) \
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \
                $(LVMLIBS) $(LMLIBS) $(LIBS)
 
 install: $(TARGETS)
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) cmirrord \
-               $(usrsbindir)/cmirrord
+       $(INSTALL_PROGRAM) -D cmirrord $(usrsbindir)/cmirrord

diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in
index e0a634950316c83b7645b0e814c246ffd18d8c3c..fb4f8f5143048d4e267f7f1948577ebd5875224e 100644 (file)
--- a/daemons/dmeventd/Makefile.in
+++ b/daemons/dmeventd/Makefile.in
@@ -36,13 +36,7 @@ ifeq ("@STATIC_LINK@", "yes")
 endif
 
 LIB_VERSION = $(LIB_VERSION_DM)
-
-ifeq ("@LIB_SUFFIX@","dylib")
-  LIB_SHARED = $(LIB_NAME).dylib
-else
-  LIB_SHARED = $(LIB_NAME).so
-  VERSIONED_SHLIB = $(LIB_SHARED).$(LIB_VERSION)
-endif
+LIB_SHARED = $(LIB_NAME).$(LIB_SUFFIX)
 
 CLEAN_TARGETS = dmeventd.static $(LIB_NAME).a
 
@@ -61,11 +55,7 @@ device-mapper: $(TARGETS)
 
 LVMLIBS += -ldevmapper-event -ldevmapper $(PTHREAD_LIBS)
 
-$(VERSIONED_SHLIB): $(LIB_SHARED)
-       $(RM) -f $@
-       $(LN_S) $(LIB_SHARED) $@
-
-dmeventd: $(LIB_SHARED) $(VERSIONED_SHLIB) dmeventd.o
+dmeventd: $(LIB_SHARED) dmeventd.o
        $(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ dmeventd.o \
        $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
 
@@ -86,32 +76,24 @@ CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
 -include $(top_builddir)/daemons/dmeventd/plugins/mirror/$(LIB_NAME)-lvm2mirror.cflow
 endif
 
-install_include:
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper-event.h \
-               $(includedir)/libdevmapper-event.h
+install_include: $(srcdir)/libdevmapper-event.h
+       $(INSTALL_DATA) -D $< $(includedir)/$(<F)
 
-install_pkgconfig:
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.pc \
-               $(usrlibdir)/pkgconfig/devmapper-event.pc
+install_pkgconfig: libdevmapper-event.pc
+       $(INSTALL_DATA) -D $< $(usrlibdir)/pkgconfig/devmapper-event.pc
 
-install_lib_dynamic: libdevmapper-event.$(LIB_SUFFIX)
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION)
-       $(LN_S) -f libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION) \
-               $(libdir)/libdevmapper-event.$(LIB_SUFFIX)
+install_lib_dynamic: install_lib_shared
 
-install_lib_static: libdevmapper-event.a
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/libdevmapper-event.a.$(LIB_VERSION)
-       $(LN_S) -f libdevmapper-event.a.$(LIB_VERSION) $(libdir)/libdevmapper-event.a
+install_lib_static: $(LIB_STATIC)
+       $(INSTALL_DATA) -D $< $(usrlibdir)/$(<F)
 
 install_lib: $(INSTALL_LIB_TARGETS)
 
 install_dmeventd_dynamic: dmeventd
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
+       $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
 
 install_dmeventd_static: dmeventd.static
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
+       $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
 
 install_dmeventd: $(INSTALL_DMEVENTD_TARGETS)
 
@@ -119,9 +101,4 @@ install: install_include install_lib install_dmeventd
 
 install_device-mapper: install_include install_lib install_dmeventd
 
-.PHONY: distclean_lib
-
-distclean_lib: 
-       $(RM) libdevmapper-event.pc
-
-distclean: distclean_lib
+DISTCLEAN_TARGETS += libdevmapper-event.pc

diff --git a/daemons/dmeventd/plugins/lvm2/Makefile.in b/daemons/dmeventd/plugins/lvm2/Makefile.in
index f44a5626dac63d1f77037fab67cbbb95927e5b93..75358685528033262e77cdc1c25b7a9a5026b2ff 100644 (file)
--- a/daemons/dmeventd/plugins/lvm2/Makefile.in
+++ b/daemons/dmeventd/plugins/lvm2/Makefile.in
@@ -19,20 +19,13 @@ CLDFLAGS += -L$(top_builddir)/tools
 
 SOURCES = dmeventd_lvm.c
 
-ifeq ("@LIB_SUFFIX@","dylib")
-  LIB_SHARED = libdevmapper-event-lvm2.dylib
-else
-  LIB_SHARED = libdevmapper-event-lvm2.so
-endif
+LIB_SHARED = libdevmapper-event-lvm2.$(LIB_SUFFIX)
 LIB_VERSION = $(LIB_VERSION_LVM)
 
 include $(top_builddir)/make.tmpl
 
 LIBS += @LVM2CMD_LIB@ -ldevmapper $(PTHREAD_LIBS)
 
-install_lvm2: libdevmapper-event-lvm2.$(LIB_SUFFIX)
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/$<.$(LIB_VERSION)
-       $(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<
+install_lvm2: install_lib_shared
 
 install: install_lvm2

diff --git a/daemons/dmeventd/plugins/mirror/Makefile.in b/daemons/dmeventd/plugins/mirror/Makefile.in
index 3dfc3a225cf841766bd3f289f651b53294993227..146361fc592e0facabbf106066d3da1404fa980e 100644 (file)
--- a/daemons/dmeventd/plugins/mirror/Makefile.in
+++ b/daemons/dmeventd/plugins/mirror/Makefile.in
@@ -22,12 +22,7 @@ CLDFLAGS += -L$(top_builddir)/tools -L$(top_builddir)/daemons/dmeventd/plugins/l
 SOURCES = dmeventd_mirror.c
 
 LIB_NAME = libdevmapper-event-lvm2mirror
-ifeq ("@LIB_SUFFIX@","dylib")
-  LIB_SHARED = $(LIB_NAME).dylib
-else
-  LIB_SHARED = $(LIB_NAME).so
-endif
-
+LIB_SHARED = $(LIB_NAME).$(LIB_SUFFIX)
 LIB_VERSION = $(LIB_VERSION_LVM)
 
 CFLOW_LIST = $(SOURCES)
@@ -37,8 +32,6 @@ include $(top_builddir)/make.tmpl
 
 LIBS += @LVM2CMD_LIB@ -ldevmapper-event-lvm2 -ldevmapper $(PTHREAD_LIBS)
 
-install_lvm2: $(LIB_NAME).$(LIB_SUFFIX)
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/$<
+install_lvm2: install_lib_shared_plugin
 
 install: install_lvm2

diff --git a/daemons/dmeventd/plugins/snapshot/Makefile.in b/daemons/dmeventd/plugins/snapshot/Makefile.in
index 0f202b386646209d24b2282383b0cab58c64175b..f36f916c370a3ab88d4a0155ba29904dbeafe85f 100644 (file)
--- a/daemons/dmeventd/plugins/snapshot/Makefile.in
+++ b/daemons/dmeventd/plugins/snapshot/Makefile.in
@@ -21,20 +21,13 @@ CLDFLAGS += -L$(top_builddir)/tools -L$(top_builddir)/daemons/dmeventd/plugins/l
 
 SOURCES = dmeventd_snapshot.c
 
-ifeq ("@LIB_SUFFIX@","dylib")
-  LIB_SHARED = libdevmapper-event-lvm2snapshot.dylib
-else
-  LIB_SHARED = libdevmapper-event-lvm2snapshot.so
-endif
-
+LIB_SHARED = libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX)
 LIB_VERSION = $(LIB_VERSION_LVM)
 
 include $(top_builddir)/make.tmpl
 
 LIBS += @LVM2CMD_LIB@ -ldevmapper-event-lvm2 -ldevmapper $(PTHREAD_LIBS)
 
-install_lvm2: libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX)
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/$<
+install_lvm2: install_lib_shared_plugin
 
 install: install_lvm2

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 61b32e94d5614df2dca92d16c1ec1496e67c2324..742cac03a099cfa344ca8bb82ba39f8727d2d990 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2004 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -22,9 +22,8 @@ include $(top_builddir)/make.tmpl
 
 install_lvm2: $(CONFSRC)
        @if [ ! -e $(confdir)/$(CONFDEST) ]; then \
-               echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \
-               @INSTALL@ -D $(OWNER) $(GROUP) -m 644 $< \
-                       $(confdir)/$(CONFDEST); \
+               echo "$(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST)"; \
+               $(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST); \
        fi
 
 install: install_lvm2

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 9662120a79f1680cb984b06ed195c6a9826efdbc..34981417309ac32adafc022127b95735f4894161 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #

diff --git a/lib/format1/Makefile.in b/lib/format1/Makefile.in
index 327a1c223dc35284320dce6f1d4e3497c071ea2c..f0f04d2d49a3a47de7ce4ab27a74d119b585ecd2 100644 (file)
--- a/lib/format1/Makefile.in
+++ b/lib/format1/Makefile.in
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -25,13 +25,9 @@ SOURCES =\
        lvm1-label.c \
        vg_number.c
 
-LIB_SHARED = liblvm2format1.so
+LIB_SHARED = liblvm2format1.$(LIB_SUFFIX)
 LIB_VERSION = $(LIB_VERSION_LVM)
 
 include $(top_builddir)/make.tmpl
 
-install: liblvm2format1.so
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/liblvm2format1.so.$(LIB_VERSION)
-       $(LN_S) -f liblvm2format1.so.$(LIB_VERSION) $(libdir)/liblvm2format1.so
-
+install: install_lib_shared_plugin

diff --git a/lib/format_pool/Makefile.in b/lib/format_pool/Makefile.in
index d9cedf06dc42ffa005ce75fe55481a988db66307..0671ee85ea431638505065690381f0291f4c2016 100644 (file)
--- a/lib/format_pool/Makefile.in
+++ b/lib/format_pool/Makefile.in
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -22,15 +22,9 @@ SOURCES =\
        import_export.c \
        pool_label.c
 
-LIB_SHARED = liblvm2formatpool.so
+LIB_SHARED = liblvm2formatpool.$(LIB_SUFFIX)
 LIB_VERSION = $(LIB_VERSION_LVM)
 
 include $(top_builddir)/make.tmpl
 
-install: liblvm2formatpool.so
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/liblvm2formatpool.so.$(LIB_VERSION)
-       $(LN_S) -f liblvm2formatpool.so.$(LIB_VERSION) \
-               $(libdir)/liblvm2formatpool.so
-
-
+install: install_lib_shared_plugin

diff --git a/lib/locking/Makefile.in b/lib/locking/Makefile.in
index 99cc206c1a8cb9c57abd7c1033fe2c5debc7335b..fee03820fd5a9ae3e4ddba940e8c88931816410c 100644 (file)
--- a/lib/locking/Makefile.in
+++ b/lib/locking/Makefile.in
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -18,14 +18,9 @@ top_builddir = @top_builddir@
 
 SOURCES = cluster_locking.c
 
-LIB_SHARED = liblvm2clusterlock.so
+LIB_SHARED = liblvm2clusterlock.$(LIB_SUFFIX)
 LIB_VERSION = $(LIB_VERSION_LVM)
 
 include $(top_builddir)/make.tmpl
 
-install install_cluster: liblvm2clusterlock.so
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/liblvm2clusterlock.so.$(LIB_VERSION)
-       $(LN_S) -f liblvm2clusterlock.so.$(LIB_VERSION) \
-               $(libdir)/liblvm2clusterlock.so
-
+install install_cluster: install_lib_shared_plugin

diff --git a/lib/mirror/Makefile.in b/lib/mirror/Makefile.in
index 233fa96f005638e4bc9ad1aa386a7007c0b395ca..2769d44d1a689cea209ee2dbf57d81513f019b3c 100644 (file)
--- a/lib/mirror/Makefile.in
+++ b/lib/mirror/Makefile.in
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -18,13 +18,9 @@ top_builddir = @top_builddir@
 
 SOURCES = mirrored.c
 
-LIB_SHARED = liblvm2mirror.so
+LIB_SHARED = liblvm2mirror.$(LIB_SUFFIX)
 LIB_VERSION = $(LIB_VERSION_LVM)
 
 include $(top_builddir)/make.tmpl
 
-install: liblvm2mirror.so
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/liblvm2mirror.so.$(LIB_VERSION)
-       $(LN_S) -f liblvm2mirror.so.$(LIB_VERSION) $(libdir)/liblvm2mirror.so
-
+install: install_lib_shared_plugin

diff --git a/lib/snapshot/Makefile.in b/lib/snapshot/Makefile.in
index e2c2b10e08a467a576b4358bab2ee82825bbf88e..7f8a54400d864b3e033d1835758452d64662aae1 100644 (file)
--- a/lib/snapshot/Makefile.in
+++ b/lib/snapshot/Makefile.in
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -18,14 +18,9 @@ top_builddir = @top_builddir@
 
 SOURCES = snapshot.c
 
-LIB_SHARED = liblvm2snapshot.so
+LIB_SHARED = liblvm2snapshot.$(LIB_SUFFIX)
 LIB_VERSION = $(LIB_VERSION_LVM)
 
 include $(top_builddir)/make.tmpl
 
-install: liblvm2snapshot.so
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/liblvm2snapshot.so.$(LIB_VERSION)
-       $(LN_S) -f liblvm2snapshot.so.$(LIB_VERSION) \
-               $(libdir)/liblvm2snapshot.so
-
+install: install_lib_shared_plugin

diff --git a/libdm/Makefile.in b/libdm/Makefile.in
index 1e9284a1c3624cd86bad4e19bd30a57a43457dbe..ba62984348046d7dabe3b455e54a3ed6d2442aa7 100644 (file)
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of the device-mapper userspace tools.
 #
@@ -38,13 +38,9 @@ ifeq ("@STATIC_LINK@", "yes")
 LIB_STATIC = $(interface)/libdevmapper.a
 endif
 
-ifeq ("@LIB_SUFFIX@","dylib")
-  LIB_SHARED = $(interface)/libdevmapper.dylib
-else
-  LIB_SHARED = $(interface)/libdevmapper.so
-endif
-VERSIONED_SHLIB = libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM)
+LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX)
 LIB_VERSION = $(LIB_VERSION_DM)
+TARGETS += libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION)
 
 CFLOW_LIST = $(SOURCES)
 CFLOW_LIST_TARGET = libdevmapper.cflow
@@ -58,6 +54,9 @@ LIBS += $(SELINUX_LIBS) $(UDEV_LIBS)
 
 device-mapper: all
 
+libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION): $(LIB_SHARED)
+       $(LN_S) -f $< $@
+
 .PHONY: install_dynamic install_static install_include \
        install_ioctl install_ioctl_static \
        install_pkgconfig
@@ -76,40 +75,20 @@ install: $(INSTALL_TYPE) install_include
 
 install_device-mapper: install
 
-install_include:
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \
-               $(includedir)/libdevmapper.h
+install_include: $(srcdir)/libdevmapper.h
+       $(INSTALL_DATA) -D $< $(includedir)/$(<F)
 
 install_dynamic: install_@interface@
-       $(LN_S) -f libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM) \
-               $(libdir)/libdevmapper.$(LIB_SUFFIX)
 
 install_static: install_@interface@_static
-       $(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a
-
-install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM)
-
-install_pkgconfig:
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.pc \
-               $(usrlibdir)/pkgconfig/devmapper.pc
-
-install_ioctl_static: ioctl/libdevmapper.a
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/libdevmapper.a.$(LIB_VERSION_DM)
-
-$(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_DM): $(interface)/%.$(LIB_SUFFIX)
-       rm -f $@
-       $(LN_S) $< $@
-       rm -f libdevmapper.$(LIB_SUFFIX)
-       $(LN_S) $< libdevmapper.$(LIB_SUFFIX)
 
-CLEAN_TARGETS += libdevmapper.$(LIB_SUFFIX) ioctl/libdevmapper.a
+install_ioctl: install_lib_shared
 
-.PHONY: distclean_lib
+install_pkgconfig: libdevmapper.pc
+       $(INSTALL_DATA) -D $< $(usrlibdir)/pkgconfig/devmapper.pc
 
-distclean_lib:
-       $(RM) libdevmapper.pc
+install_ioctl_static: $(LIB_STATIC)
+       $(INSTALL_DATA) -D $< $(usrlibdir)/$(<F)
 
-distclean: distclean_lib
+CLEAN_TARGETS += ioctl/libdevmapper.a
+DISTCLEAN_TARGETS += libdevmapper.pc

diff --git a/liblvm/Makefile.in b/liblvm/Makefile.in
index 165ce46ffa1dfac21a3c02a373e9475e9f0ecf35..66904296b3588c4541c530157c039f36febb58cc 100644 (file)
--- a/liblvm/Makefile.in
+++ b/liblvm/Makefile.in
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -25,19 +25,14 @@ SOURCES =\
 
 LIB_NAME = liblvm2app
 LIB_VERSION = $(LIB_VERSION_APP)
-VERSIONED_SHLIB = $(LIB_NAME).$(LIB_SUFFIX).$(LIB_VERSION_APP)
 
 ifeq ("@STATIC_LINK@", "yes")
   LIB_STATIC = $(LIB_NAME).a
 endif
 
-ifeq ("@LIB_SUFFIX@","dylib")
-  LIB_SHARED = $(LIB_NAME).dylib
-else
-  LIB_SHARED = $(LIB_NAME).so
-endif
+LIB_SHARED = $(LIB_NAME).$(LIB_SUFFIX)
 
-CLEAN_TARGETS += liblvm.cflow
+CLEAN_TARGETS += liblvm.cflow $(LIB_NAME).a
 
 include $(top_builddir)/make.tmpl
 
@@ -47,12 +42,7 @@ ifeq ("@DMEVENTD@", "yes")
   LIBS += -ldevmapper-event
 endif
 
-$(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_APP): %.$(LIB_SUFFIX)
-       rm -f $@
-       $(LN_S) $< $@
-
-.PHONY: install_dynamic install_static install_include install_pkgconfig \
-       distclean_lib distclean
+.PHONY: install_dynamic install_static install_include install_pkgconfig
 
 INSTALL_TYPE = install_dynamic
 
@@ -66,23 +56,16 @@ endif
 
 install: $(INSTALL_TYPE) install_include
 
-install_include:
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2app.h $(includedir)/lvm2app.h
+install_include: $(srcdir)/lvm2app.h
+       $(INSTALL_DATA) -D $< $(includedir)/$(<F)
 
-install_dynamic: $(LIB_SHARED)
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/$(LIB_SHARED).$(LIB_VERSION_APP)
-       $(LN_S) -f $(LIB_SHARED).$(LIB_VERSION_APP) \
-               $(libdir)/$(LIB_SHARED)
+install_dynamic: install_lib_shared
 
 install_static: $(LIB_STATIC)
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/$(LIB_STATIC).$(LIB_VERSION_APP)
-       $(LN_S) -f $(LIB_STATIC).$(LIB_VERSION_APP) $(libdir)/$(LIB_STATIC)
+       $(INSTALL_DATA) -D $< $(usrlibdir)/$(<F)
 
-install_pkgconfig:
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(LIB_NAME).pc \
-               $(usrlibdir)/pkgconfig/lvm2app.pc
+install_pkgconfig: $(LIB_NAME).pc
+       $(INSTALL_DATA) -D $< $(usrlibdir)/pkgconfig/lvm2app.pc
 
 liblvm.cflow: $(SOURCES)
        set -e; (echo -n "SOURCES += "; \
@@ -92,9 +75,4 @@ liblvm.cflow: $(SOURCES)
 
 cflow: liblvm.cflow
 
-CLEAN_TARGETS += $(LIB_NAME).$(LIB_SUFFIX)
-
-distclean_lib:
-       $(RM) $(LIB_NAME).pc
-
-distclean: distclean_lib
+DISTCLEAN_TARGETS += $(LIB_NAME).pc

diff --git a/make.tmpl.in b/make.tmpl.in
index 6a79551089a56e9ae34d3ea0788d00558a7fe2ee..da8b020f0760d30ee37aa964f9393a03793800f9 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -72,16 +72,24 @@ vpath %.exported_symbols $(srcdir)
 interface = @interface@
 interfacebuilddir = $(top_builddir)/libdm/$(interface)
 
-# setup misc variables
-# define the ownership variables for the binaries and man pages
-OWNER = @OWNER@
-GROUP = @GROUP@
-
 # The number of jobs to run, if blank, defaults to the make standard
 ifndef MAKEFLAGS
 MAKEFLAGS = @JOBS@
 endif
 
+# Handle installation of files
+ifeq ("@WRITE_INSTALL@", "yes")
+# leaving defaults
+M_INSTALL_PROGRAM =
+M_INSTALL_DATA = -m 644
+else
+M_INSTALL_PROGRAM = -m 555
+M_INSTALL_DATA = -m 444
+endif
+INSTALL_PROGRAM = $(INSTALL) $(M_INSTALL_PROGRAM) $(STRIP)
+INSTALL_DATA = $(INSTALL) -p $(M_INSTALL_DATA)
+INSTALL_WDATA = $(INSTALL) -p -m 644
+
 .SUFFIXES: .c .d .o .so .a .po .pot .mo .dylib
 
 CFLAGS += -fPIC -Wall -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline -Wmissing-noreturn -Wformat-security
@@ -152,6 +160,7 @@ POTFILES = $(SOURCES:%.c=%.pot)
 
 .PHONY: all pofile distclean clean cleandir cflow device-mapper
 .PHONY: install install_cluster install_device-mapper install_lvm2
+.PHONY: install_lib_shared install_lib_shared_plugin
 .PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean)
 .PHONY: $(SUBDIRS.pofile) $(SUBDIRS.install_cluster) $(SUBDIRS.cflow)
 .PHONY: $(SUBDIRS.device-mapper) $(SUBDIRS.install-device-mapper)
@@ -166,7 +175,7 @@ SUBDIRS.cflow := $(SUBDIRS:=.cflow)
 SUBDIRS.clean := $(SUBDIRS:=.clean)
 SUBDIRS.distclean := $(SUBDIRS:=.distclean)
 
-TARGETS += $(LIB_SHARED) $(LIB_STATIC) $(VERSIONED_SHLIB)
+TARGETS += $(LIB_SHARED) $(LIB_STATIC)
 
 all: $(SUBDIRS) $(TARGETS)
 
@@ -273,16 +282,30 @@ $(TARGETS): $(OBJECTS)
 %.so: %.o
        $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(CLDFLAGS) $< $(LIBS) -o $@
 
+ifneq (,$(LIB_SHARED))
+
+TARGETS += $(LIB_SHARED).$(LIB_VERSION)
+$(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS)
 ifeq ("@LIB_SUFFIX@","so")
-$(LIB_SHARED): $(OBJECTS) $(LDDEPS)
-       $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
-       $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
+       $(CC) -shared -Wl,-soname,$(notdir $@) \
+               $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
 endif
-
 ifeq ("@LIB_SUFFIX@","dylib")
-$(LIB_SHARED): $(OBJECTS) $(LDDEPS)
        $(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
-       $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
+               $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
+endif
+
+$(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
+       $(LN_S) -f $(<F) $@
+
+install_lib_shared: $(LIB_SHARED)
+       $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
+       $(INSTALL) -d $(usrlibdir)
+       $(LN_S) -f $(libdir)/$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
+
+# FIXME: plugins are currently installed with .so suffix only
+install_lib_shared_plugin: $(LIB_SHARED)
+       $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F)
 endif
 
 %.so: %.a

diff --git a/man/Makefile.in b/man/Makefile.in
index f34014ea54a8d6260e7e2b88b7c6a81afbd6c984..9b538410acfdb3a8855807bd786cfdc263457491 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -56,7 +56,7 @@ endif
 
 all: man
 
-.PHONY: man
+.PHONY: man install_man5 install_man8
 
 device-mapper: $(MAN8DM)
 
@@ -70,35 +70,22 @@ $(MAN5) $(MAN8) $(MAN8CLUSTER):     Makefile
          *) echo "Creating $@" ; $(SED) -e "s/#VERSION#/$(LVM_VERSION)/" $< > $@ ;; \
        esac
 
-install_lvm2:
-       @echo "Installing $(MAN8) in $(MAN8DIR)"
-       @for f in $(MAN8); \
-       do \
-          $(RM) $(MAN8DIR)/$$f; \
-          @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
-       done
-
-       @echo "Installing $(MAN5) in $(MAN5DIR)"
-       @for f in $(MAN5); \
-       do \
-          $(RM) $(MAN5DIR)/$$f; \
-          @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN5DIR)/$$f; \
-       done
-
-install_cluster:
-       @echo "Installing $(MAN8CLUSTER) in $(MAN8DIR)"
-       @for f in $(MAN8CLUSTER); \
-       do \
-          $(RM) $(MAN8DIR)/$$f; \
-          @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
-       done
-
-install_device-mapper:
-       @echo "Installing $(MAN8DM) in $(MAN8DIR)"
-       @for f in $(MAN8DM); \
-       do \
-          $(RM) $(MAN8DIR)/$$f; \
-          @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
-       done
+install_man5: $(MAN5)
+       $(INSTALL) -d $(MAN5DIR)
+       $(INSTALL_DATA) $(MAN5) $(MAN5DIR)/
+
+install_man8: $(MAN8)
+       $(INSTALL) -d $(MAN8DIR)
+       $(INSTALL_DATA) $(MAN8) $(MAN8DIR)/
+
+install_lvm2: install_man5 install_man8
+
+install_cluster: $(MAN8CLUSTER)
+       $(INSTALL) -d $(MAN8DIR)
+       $(INSTALL_DATA) $(MAN8CLUSTER) $(MAN8DIR)/
+
+install_device-mapper: $(MAN8DM)
+       $(INSTALL) -d $(MAN8DIR)
+       $(INSTALL_DATA) $(MAN8DM) $(MAN8DIR)/
 
 install: install_lvm2 install_device-mapper

diff --git a/po/Makefile.in b/po/Makefile.in
index 79bd3400509e5ce6692d80e3a4d7c166ba032c6a..a4f57a68f915f0b035a3c95b96ffe9e3091694b7 100644 (file)
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -53,13 +53,13 @@ install: $(TARGETS)
        @echo Installing translation files in $(localedir)
        @( \
                for lang in $(LANGS); do \
-                       $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $$lang.mo \
+                       $(INSTALL_DATA) -D $$lang.mo \
                            $(localedir)/$$lang/LC_MESSAGES/lvm2.mo;\
          done; \
        )
        @( \
                for lang in $(LANGS); do \
-                       $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $$lang.mo \
+                       $(INSTALL_DATA) -D $$lang.mo \
                            $(localedir)/$$lang/LC_MESSAGES/device-mapper.mo;\
          done; \
        )

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 4b1ab7f33727f8e007a77505087463373861190a..b76e33926c32301458c643e1393995e06087dd81 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2006-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -17,16 +17,18 @@ top_builddir = @top_builddir@
 
 include $(top_builddir)/make.tmpl
 
-install:
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(srcdir)/lvm_dump.sh \
-               $(sbindir)/lvmdump
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(srcdir)/vgimportclone.sh \
-               $(sbindir)/vgimportclone
+SCRIPTS = lvm_dump.sh vgimportclone.sh
 ifeq ("@FSADM@", "yes")
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(srcdir)/fsadm.sh \
-               $(sbindir)/fsadm
+       SCRIPTS += fsadm.sh
 endif
 
-install_lvm2: install
+vpath %.sh $(srcdir)
+
+%_install: %.sh
+       $(INSTALL_PROGRAM) -D $< $(sbindir)/$(basename $(<F))
+
+install_lvm2: $(SCRIPTS:.sh=_install)
+
+install: install_lvm2
 
 DISTCLEAN_TARGETS += clvmd_init_red_hat cmirrord_init_red_hat lvm2_monitoring_init_red_hat

diff --git a/test/Makefile.in b/test/Makefile.in
index 90ce1f7920c3b4231477267c68809ae78e32ab43..25cb4879303182061c2bc8934c9e9ff095055629 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2007-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #

diff --git a/tools/Makefile.in b/tools/Makefile.in
index b048fad946bae80f9b78386fc4325dfe41f0ccfb..0a4d75f613ec8742b1800ceb3848bfed496bf394 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -78,7 +78,7 @@ TARGETS_DM = dmsetup
 
 INSTALL_LVM_TARGETS = install_tools_dynamic
 INSTALL_DMSETUP_TARGETS = install_dmsetup_dynamic
-INSTALL_CMDLIB_TARGETS = install_cmdlib_dynamic
+INSTALL_CMDLIB_TARGETS = install_cmdlib_dynamic install_cmdlib_include 
 
 ifeq ("@STATIC_LINK@", "yes")
   TARGETS += lvm.static
@@ -92,10 +92,11 @@ LVMLIBS = $(LVMINTERNAL_LIBS)
 LIB_VERSION = $(LIB_VERSION_LVM)
 
 CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) $(TARGETS_DM) \
+       liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) lvm-static.o \
        liblvm2cmd-static.a dmsetup.static lvm.static
 
 ifeq ("@CMDLIB@", "yes")
-       TARGETS += liblvm2cmd.$(LIB_SUFFIX)
+       TARGETS += liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)
        INSTALL_LVM_TARGETS += $(INSTALL_CMDLIB_TARGETS)
 endif
 
@@ -145,6 +146,9 @@ liblvm2cmd-static.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.
 
 liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
 
+liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX)
+       $(LN_S) -f $< $@
+
 .commands: $(srcdir)/commands.h $(srcdir)/cmdnames.h Makefile
        $(CC) -E -P $(srcdir)/cmdnames.h 2> /dev/null | \
                egrep -v '^ *(|#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands
@@ -155,44 +159,37 @@ CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
 -include $(top_builddir)/lib/liblvm-internal.cflow
 endif
 
-.PHONY: install_cmdlib_dynamic install_cmdlib_static \
+.PHONY: install_cmdlib_dynamic install_cmdlib_static install_cmdlib_include \
        install_tools_dynamic install_tools_static \
        install_dmsetup_dynamic install_dmsetup_static
 
+install_cmdlib_include: $(srcdir)/lvm2cmd.h
+       $(INSTALL_DATA) -D $< $(includedir)/$(<F)
+
 install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)
-       $(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) $(libdir)/liblvm2cmd.$(LIB_SUFFIX)
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
-               $(includedir)/lvm2cmd.h
+       $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
+       $(INSTALL) -d $(usrlibdir)
+       $(LN_S) -f $(libdir)/$<.$(LIB_VERSION) $(usrlibdir)/$(<F)
 
 install_cmdlib_static: liblvm2cmd-static.a
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/liblvm2cmd.a.$(LIB_VERSION)
-       $(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
-               $(includedir)/lvm2cmd.h
+       $(INSTALL_DATA) -D $< $(usrlibdir)/liblvm2cmd.a
 
 install_tools_dynamic: lvm .commands
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm \
-               $(sbindir)/lvm
+       $(INSTALL_PROGRAM) -D lvm $(sbindir)/lvm
        @echo Creating symbolic links for individual commands in $(sbindir)
-       @( \
-               for v in `cat .commands`; do \
-                       cd $(sbindir); \
-                       $(LN_S) -f lvm $$v; \
-               done; \
-       )
+       @for v in `cat .commands`; do \
+               echo "$(LN_S) -f lvm $(sbindir)/$$v"; \
+               $(LN_S) -f lvm $(sbindir)/$$v; \
+       done;
 
 install_tools_static: lvm.static
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-               $(staticdir)/lvm.static
+       $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
 
 install_dmsetup_dynamic: dmsetup
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
+       $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
 
 install_dmsetup_static: dmsetup.static
-       $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
+       $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
 
 install_device-mapper: $(INSTALL_DMSETUP_TARGETS)