mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-03 05:18:29 +03:00
lvm.static can be installed in different dir from rest of tools
This commit is contained in:
parent
4a7f3eb274
commit
0a62c911d1
19
configure
vendored
19
configure
vendored
@ -309,7 +309,7 @@ ac_includes_default="\
|
|||||||
#endif"
|
#endif"
|
||||||
|
|
||||||
ac_default_prefix=/usr
|
ac_default_prefix=/usr
|
||||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os MSGFMT JOBS STATIC_LINK LVM1 OWNER GROUP CLDFLAGS CLDWHOLEARCHIVE CLDNOWHOLEARCHIVE LD_DEPS LD_FLAGS SOFLAG LVM_VERSION LVM1_FALLBACK DEBUG DEVMAPPER HAVE_LIBDL HAVE_SELINUX CMDLIB LOCALEDIR CONFDIR INTL_PACKAGE INTL LIBOBJS LTLIBOBJS'
|
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os MSGFMT JOBS STATIC_LINK LVM1 OWNER GROUP CLDFLAGS CLDWHOLEARCHIVE CLDNOWHOLEARCHIVE LD_DEPS LD_FLAGS SOFLAG LVM_VERSION LVM1_FALLBACK DEBUG DEVMAPPER HAVE_LIBDL HAVE_SELINUX CMDLIB LOCALEDIR CONFDIR STATICDIR INTL_PACKAGE INTL LIBOBJS LTLIBOBJS'
|
||||||
ac_subst_files=''
|
ac_subst_files=''
|
||||||
|
|
||||||
# Initialize some variables set by options.
|
# Initialize some variables set by options.
|
||||||
@ -865,7 +865,8 @@ Optional Packages:
|
|||||||
--with-lvm1=TYPE LVM1 metadata support: internal/shared/none
|
--with-lvm1=TYPE LVM1 metadata support: internal/shared/none
|
||||||
TYPE=internal
|
TYPE=internal
|
||||||
--with-localedir=DIR Translation files in DIR PREFIX/share/locale
|
--with-localedir=DIR Translation files in DIR PREFIX/share/locale
|
||||||
--with-confdir=DIR Configuration files in DIR EXEC_PREFIX/etc
|
--with-confdir=DIR Configuration files in DIR /etc
|
||||||
|
--with-staticdir=DIR Static binary in DIR EXEC_PREFIX/sbin
|
||||||
|
|
||||||
Some influential environment variables:
|
Some influential environment variables:
|
||||||
CC C compiler command
|
CC C compiler command
|
||||||
@ -5063,9 +5064,19 @@ if test "${with_confdir+set}" = set; then
|
|||||||
withval="$with_confdir"
|
withval="$with_confdir"
|
||||||
CONFDIR="$withval"
|
CONFDIR="$withval"
|
||||||
else
|
else
|
||||||
CONFDIR='${exec_prefix}/etc'
|
CONFDIR='/etc'
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
|
|
||||||
|
# Check whether --with-staticdir or --without-staticdir was given.
|
||||||
|
if test "${with_staticdir+set}" = set; then
|
||||||
|
withval="$with_staticdir"
|
||||||
|
STATICDIR="$withval"
|
||||||
|
else
|
||||||
|
STATICDIR='${exec_prefix}/sbin'
|
||||||
|
fi;
|
||||||
|
|
||||||
|
|
||||||
if test "-f VERSION"; then
|
if test "-f VERSION"; then
|
||||||
LVM_VERSION="\"`cat VERSION`\""
|
LVM_VERSION="\"`cat VERSION`\""
|
||||||
else
|
else
|
||||||
@ -5096,6 +5107,7 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ac_config_files="$ac_config_files Makefile make.tmpl doc/Makefile include/Makefile lib/Makefile lib/format1/Makefile man/Makefile po/Makefile tools/Makefile tools/version.h test/mm/Makefile test/device/Makefile test/format1/Makefile test/regex/Makefile test/filters/Makefile"
|
ac_config_files="$ac_config_files Makefile make.tmpl doc/Makefile include/Makefile lib/Makefile lib/format1/Makefile man/Makefile po/Makefile tools/Makefile tools/version.h test/mm/Makefile test/device/Makefile test/format1/Makefile test/regex/Makefile test/filters/Makefile"
|
||||||
@ -5797,6 +5809,7 @@ s,@HAVE_SELINUX@,$HAVE_SELINUX,;t t
|
|||||||
s,@CMDLIB@,$CMDLIB,;t t
|
s,@CMDLIB@,$CMDLIB,;t t
|
||||||
s,@LOCALEDIR@,$LOCALEDIR,;t t
|
s,@LOCALEDIR@,$LOCALEDIR,;t t
|
||||||
s,@CONFDIR@,$CONFDIR,;t t
|
s,@CONFDIR@,$CONFDIR,;t t
|
||||||
|
s,@STATICDIR@,$STATICDIR,;t t
|
||||||
s,@INTL_PACKAGE@,$INTL_PACKAGE,;t t
|
s,@INTL_PACKAGE@,$INTL_PACKAGE,;t t
|
||||||
s,@INTL@,$INTL,;t t
|
s,@INTL@,$INTL,;t t
|
||||||
s,@LIBOBJS@,$LIBOBJS,;t t
|
s,@LIBOBJS@,$LIBOBJS,;t t
|
||||||
|
11
configure.in
11
configure.in
@ -259,9 +259,15 @@ if test x$INTL = xyes; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
AC_ARG_WITH(confdir,
|
AC_ARG_WITH(confdir,
|
||||||
[ --with-confdir=DIR Configuration files in DIR [EXEC_PREFIX/etc]],
|
[ --with-confdir=DIR Configuration files in DIR [/etc]],
|
||||||
[ CONFDIR="$withval" ],
|
[ CONFDIR="$withval" ],
|
||||||
[ CONFDIR='${exec_prefix}/etc' ])
|
[ CONFDIR='/etc' ])
|
||||||
|
|
||||||
|
AC_ARG_WITH(staticdir,
|
||||||
|
[ --with-staticdir=DIR Static binary in DIR [EXEC_PREFIX/sbin]],
|
||||||
|
[ STATICDIR="$withval" ],
|
||||||
|
[ STATICDIR='${exec_prefix}/sbin' ])
|
||||||
|
|
||||||
|
|
||||||
if test "-f VERSION"; then
|
if test "-f VERSION"; then
|
||||||
LVM_VERSION="\"`cat VERSION`\""
|
LVM_VERSION="\"`cat VERSION`\""
|
||||||
@ -292,6 +298,7 @@ AC_SUBST(CMDLIB)
|
|||||||
AC_SUBST(MSGFMT)
|
AC_SUBST(MSGFMT)
|
||||||
AC_SUBST(LOCALEDIR)
|
AC_SUBST(LOCALEDIR)
|
||||||
AC_SUBST(CONFDIR)
|
AC_SUBST(CONFDIR)
|
||||||
|
AC_SUBST(STATICDIR)
|
||||||
AC_SUBST(INTL_PACKAGE)
|
AC_SUBST(INTL_PACKAGE)
|
||||||
AC_SUBST(INTL)
|
AC_SUBST(INTL)
|
||||||
|
|
||||||
|
@ -43,6 +43,7 @@ sbindir = $(DESTDIR)@sbindir@
|
|||||||
infodir = $(DESTDIR)@infodir@
|
infodir = $(DESTDIR)@infodir@
|
||||||
mandir = $(DESTDIR)@mandir@
|
mandir = $(DESTDIR)@mandir@
|
||||||
localedir = $(DESTDIR)@LOCALEDIR@
|
localedir = $(DESTDIR)@LOCALEDIR@
|
||||||
|
staticdir = $(DESTDIR)@STATICDIR@
|
||||||
|
|
||||||
# setup misc variables
|
# setup misc variables
|
||||||
# define the ownership variables for the binaries and man pages
|
# define the ownership variables for the binaries and man pages
|
||||||
|
@ -134,7 +134,7 @@ install_tools_dynamic: lvm .commands
|
|||||||
|
|
||||||
install_tools_static: lvm.static
|
install_tools_static: lvm.static
|
||||||
$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) lvm.static \
|
$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) lvm.static \
|
||||||
$(sbindir)/lvm.static
|
$(staticdir)/lvm.static
|
||||||
|
|
||||||
install: $(INSTALL_TARGETS)
|
install: $(INSTALL_TARGETS)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user