diff options
author | Alasdair Kergon <agk@redhat.com> | 2004-04-19 13:10:06 +0000 |
---|---|---|
committer | Alasdair Kergon <agk@redhat.com> | 2004-04-19 13:10:06 +0000 |
commit | 9314c7c88143f507babc6b112dcc2c2a2a2c80dd (patch) | |
tree | 469c03adeebf89cfdfe8c520cc29c77ceba66304 | |
parent | 54abb2c572832c034e2c336f3cb3356dedbdecb6 (diff) | |
download | lvm2-2_00_15.tar.gz |
config option to avoid using install -o -gv2_00_15old-v2_00_15
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | WHATS_NEW | 4 | ||||
-rw-r--r-- | WHATS_NEW_DM | 4 | ||||
-rwxr-xr-x | configure | 15 | ||||
-rw-r--r-- | configure.in | 17 | ||||
-rw-r--r-- | doc/Makefile.in | 2 | ||||
-rw-r--r-- | lib/format1/Makefile.in | 2 | ||||
-rw-r--r-- | libdm/Makefile.in | 10 | ||||
-rw-r--r-- | man/Makefile.in | 4 | ||||
-rw-r--r-- | po/Makefile.in | 2 | ||||
-rw-r--r-- | tools/Makefile.in | 12 |
11 files changed, 49 insertions, 25 deletions
@@ -1 +1 @@ -2.00.14-cvs (2004-04-16) +2.00.15-cvs (2004-04-19) @@ -1,3 +1,7 @@ +Version 2.00.15 - 19 Apr 2004 +============================= + configure --with-owner= --with-group= to avoid -o and -g args to 'install' + Version 2.00.14 - 16 Apr 2004 ============================= Use 64-bit file functions by default. diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 258f7fc4e..222e6e543 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,3 +1,7 @@ +Version 1.00.17 - 17 Apr 2004 +============================= + configure --with-owner= --with-group= to avoid -o and -g args to 'install' + Version 1.00.16 - 16 Apr 2004 ============================= Ignore error setting selinux file context if fs doesn't support it. @@ -3907,24 +3907,31 @@ esac +OWNER="root" +GROUP="root" + # Check whether --with-user or --without-user was given. if test "${with_user+set}" = set; then withval="$with_user" OWNER="$withval" -else - OWNER="root" fi; +if test x$OWNER != x; then + OWNER="-o $OWNER" +fi + # Check whether --with-group or --without-group was given. if test "${with_group+set}" = set; then withval="$with_group" GROUP="$withval" -else - GROUP="root" fi; +if test x$GROUP != x; then + GROUP="-g $GROUP" +fi + # Check whether --enable-lvm1_fallback or --disable-lvm1_fallback was given. if test "${enable_lvm1_fallback+set}" = set; then enableval="$enable_lvm1_fallback" diff --git a/configure.in b/configure.in index 748eaf70b..42636eff4 100644 --- a/configure.in +++ b/configure.in @@ -74,17 +74,26 @@ esac dnl -- prefix is /usr by default, the exec_prefix default is setup later AC_PREFIX_DEFAULT(/usr) +OWNER="root" +GROUP="root" + dnl -- setup the ownership of the files AC_ARG_WITH(user, [ --with-user=USER Set the owner of installed files ], - [ OWNER="$withval" ], - [ OWNER="root" ]) + [ OWNER="$withval" ]) + +if test x$OWNER != x; then + OWNER="-o $OWNER" +fi dnl -- setup the group ownership of the files AC_ARG_WITH(group, [ --with-group=GROUP Set the group owner of installed files ], - [ GROUP="$withval" ], - [ GROUP="root" ]) + [ GROUP="$withval" ]) + +if test x$GROUP != x; then + GROUP="-g $GROUP" +fi dnl -- LVM1 tool fallback option AC_ARG_ENABLE(lvm1_fallback, [ --enable-lvm1_fallback Use this to fall back and use LVM1 binaries if diff --git a/doc/Makefile.in b/doc/Makefile.in index 554f9eda6..39ff4e919 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -23,7 +23,7 @@ include ../make.tmpl install: @if [ ! -e $(confdir)/$(CONFDEST) ]; then \ echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \ - @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 644 $(CONFSRC) \ + @INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \ $(confdir)/$(CONFDEST); \ fi diff --git a/lib/format1/Makefile.in b/lib/format1/Makefile.in index e046390ec..924a87ca4 100644 --- a/lib/format1/Makefile.in +++ b/lib/format1/Makefile.in @@ -32,7 +32,7 @@ include ../../make.tmpl .PHONY: install install: liblvm2format1.so - $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(libdir)/liblvm2format1.so.$(LIB_VERSION) $(LN_S) -f liblvm2format1.so.$(LIB_VERSION) $(libdir)/liblvm2format1.so diff --git a/libdm/Makefile.in b/libdm/Makefile.in index 54223f8bb..2785108c8 100644 --- a/libdm/Makefile.in +++ b/libdm/Makefile.in @@ -39,24 +39,24 @@ install: $(INSTALL_TYPE) install_dynamic: install_@interface@ $(LN_S) -f libdevmapper.so.$(LIB_VERSION) $(libdir)/libdevmapper.so - $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 libdevmapper.h \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \ $(includedir)/libdevmapper.h install_static: install_@interface@_static $(LN_S) -f libdevmapper.a.$(LIB_VERSION) $(libdir)/libdevmapper.a - $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 libdevmapper.h \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \ $(includedir)/libdevmapper.h install_fs: fs/libdevmapper.so - $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(libdir)/libdevmapper.so.$(LIB_VERSION) install_ioctl: ioctl/libdevmapper.so - $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(libdir)/libdevmapper.so.$(LIB_VERSION) install_ioctl_static: ioctl/libdevmapper.a - $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(libdir)/libdevmapper.a.$(LIB_VERSION) .PHONY: distclean_lib distclean diff --git a/man/Makefile.in b/man/Makefile.in index be2fb4ec0..50a0a0062 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -34,12 +34,12 @@ install: @for f in $(MAN8); \ do \ $(RM) $(MAN8DIR)/$$f; \ - @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(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 -o $(OWNER) -g $(GROUP) -m 444 $$f $(MAN5DIR)/$$f; \ + @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN5DIR)/$$f; \ done diff --git a/po/Makefile.in b/po/Makefile.in index b4c74374c..603854ae3 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -25,7 +25,7 @@ install: $(TARGETS) @echo Installing translation files in $(localedir) @( \ for lang in $(LANGS); do \ - $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 $$lang.mo \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $$lang.mo \ $(localedir)/$$lang/LC_MESSAGES/@INTL_PACKAGE@.mo;\ done; \ ) diff --git a/tools/Makefile.in b/tools/Makefile.in index 51ae2ab9a..64c49aa9c 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -108,21 +108,21 @@ liblvm2cmd.so: liblvm2cmd.a $(LD_DEPS) install_tools_dynamic install_tools_static install_cmdlib_dynamic: liblvm2cmd.so - $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) liblvm2cmd.so \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.so \ $(libdir)/liblvm2cmd.so.$(LIB_VERSION) $(LN_S) -f liblvm2cmd.so.$(LIB_VERSION) $(libdir)/liblvm2cmd.so - $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 lvm2cmd.h \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \ $(includedir)/lvm2cmd.h install_cmdlib_static: liblvm2cmd.a - $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) liblvm2cmd.a \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.a \ $(libdir)/liblvm2cmd.a.$(LIB_VERSION) $(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a - $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 lvm2cmd.h \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \ $(includedir)/lvm2cmd.h install_tools_dynamic: lvm .commands - $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) lvm \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm \ $(sbindir)/lvm @echo Creating symbolic links for individual commands in $(sbindir) @( \ @@ -133,7 +133,7 @@ install_tools_dynamic: lvm .commands ) install_tools_static: lvm.static - $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) lvm.static \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \ $(staticdir)/lvm.static install: $(INSTALL_TARGETS) |