shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-28 02:50:41 +03:00
Code Releases Activity

configure: fix install location of profile dir

Browse Source 
Seems like we have a bit overcomplicated set of options
for deducing individual install dirs.

This patch fixes installation issues with DESTDIR,
but the whole set of configure options should be simplified.
This commit is contained in:
Zdenek Kabelac 2013-07-03 13:07:39 +02:00
parent eeb164b50f
commit ffa11ed356
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/Makefile.in
View File

@ -30,8 +30,8 @@ install_conf: $(CONFSRC)
fi
install_profiles: $(PROFILES)
$(INSTALL) -d $(DEFAULT_PROFILE_DIR)
$(INSTALL_DATA) $(PROFILES) $(DEFAULT_PROFILE_DIR)/
$(INSTALL_DIR) $(DESTDIR)$(DEFAULT_PROFILE_DIR)
$(INSTALL_DATA) $(PROFILES) $(DESTDIR)$(DEFAULT_PROFILE_DIR)/
install_lvm2: install_conf install_profiles

4
configure vendored
View File

@ -10066,7 +10066,7 @@ fi
if test "${with_confdir+set}" = set; then :
withval=$with_confdir; CONFDIR=$withval
else
CONFDIR="/etc"
CONFDIR='${exec_prefix}/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="/etc/lvm"
DEFAULT_SYS_DIR='${exec_prefix}/etc/lvm'
fi

6
configure.in
View File

@ -1279,7 +1279,7 @@ fi
AC_ARG_WITH(confdir,
AC_HELP_STRING([--with-confdir=DIR],
[configuration files in DIR [[/etc]]]),
CONFDIR=$withval, CONFDIR="/etc")
CONFDIR=$withval, CONFDIR='${exec_prefix}/etc')
AC_ARG_WITH(staticdir,
AC_HELP_STRING([--with-staticdir=DIR],
@ -1416,8 +1416,8 @@ fi
dnl -- various defaults
AC_ARG_WITH(default-system-dir,
AC_HELP_STRING([--with-default-system-dir=DIR],
[default LVM system directory [[/etc/lvm]]]),
DEFAULT_SYS_DIR=$withval, DEFAULT_SYS_DIR="/etc/lvm")
[default LVM system directory [[EPREFIX/etc/lvm]]]),
DEFAULT_SYS_DIR=$withval, DEFAULT_SYS_DIR='${exec_prefix}/etc/lvm')
AC_DEFINE_UNQUOTED(DEFAULT_SYS_DIR, ["$DEFAULT_SYS_DIR"],
[Path to LVM system directory.])