shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

configure: revert /etc changes

Browse Source 
The idea of using 'eprefix' unfortunatelly fails on /usr moved distros.
But there is also default --sysconfdir which is normaly set to /etc.
If unset it's PREFIX/etc.

For now revert.

FIXME: replace lvm vars with standard ones everyone is using.
This commit is contained in:
Zdenek Kabelac 2013-07-04 11:52:25 +02:00
parent 2c4f81634f
commit f884970797
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -1639,7 +1639,7 @@ Optional Packages:
--with-dmeventd-path=PATH
dmeventd path [[EPREFIX/sbin/dmeventd]]
--with-default-system-dir=DIR
default LVM system directory [[EPREFIX/etc/lvm]]
default LVM system directory [[/etc/lvm]]
--with-default-profile-subdir=SUBDIR
default configuration profile subdir [[profile]]
--with-default-archive-subdir=SUBDIR
@ -10066,7 +10066,7 @@ fi
if test "${with_confdir+set}" = set; then :
withval=$with_confdir; CONFDIR=$withval
else
CONFDIR='${exec_prefix}/etc'
CONFDIR='/etc'
fi
@ -10549,7 +10549,7 @@ fi
if test "${with_default_system_dir+set}" = set; then :
withval=$with_default_system_dir; DEFAULT_SYS_DIR=$withval
else
DEFAULT_SYS_DIR="$lvm_exec_prefix/etc/lvm"
DEFAULT_SYS_DIR="/etc/lvm"
fi

8
configure.in
View File

@ -1276,10 +1276,11 @@ if test x$INTL = xyes; then
fi
################################################################################
dnl -- FIXME: need to switch to regular option here --sysconfdir
AC_ARG_WITH(confdir,
AC_HELP_STRING([--with-confdir=DIR],
[configuration files in DIR [[/etc]]]),
CONFDIR=$withval, CONFDIR='${exec_prefix}/etc')
CONFDIR=$withval, CONFDIR='/etc')
AC_ARG_WITH(staticdir,
AC_HELP_STRING([--with-staticdir=DIR],
@ -1414,10 +1415,11 @@ fi
################################################################################
dnl -- various defaults
dnl -- FIXME: need to switch to regular option here --sysconfdir
AC_ARG_WITH(default-system-dir,
AC_HELP_STRING([--with-default-system-dir=DIR],
[default LVM system directory [[EPREFIX/etc/lvm]]]),
DEFAULT_SYS_DIR=$withval, DEFAULT_SYS_DIR="$lvm_exec_prefix/etc/lvm")
[default LVM system directory [[/etc/lvm]]]),
DEFAULT_SYS_DIR=$withval, DEFAULT_SYS_DIR="/etc/lvm")
AC_DEFINE_UNQUOTED(DEFAULT_SYS_DIR, ["$DEFAULT_SYS_DIR"],
[Path to LVM system directory.])