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: expand prefix and exec_prefix directly in configure

Browse Source 
In case someone wants to use @some_path@ that contains
prefix or exec_prefix and it's used in other files than Makefiles
(Makefiles used make.tmpl to expand these).
This commit is contained in:
Peter Rajnoha 2014-11-19 16:02:41 +01:00
parent 74ed1ba9f9
commit 7639eae891
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -8441,7 +8441,7 @@ $as_echo "$OCF" >&6; }
if test "${with_ocfdir+set}" = set; then : if test "${with_ocfdir+set}" = set; then :
withval=$with_ocfdir; OCFDIR=$withval withval=$with_ocfdir; OCFDIR=$withval
else else
OCFDIR='${prefix}/lib/ocf/resource.d/lvm2' OCFDIR="${prefix}/lib/ocf/resource.d/lvm2"
fi fi
@ -11935,7 +11935,7 @@ fi
if test "${with_localedir+set}" = set; then : if test "${with_localedir+set}" = set; then :
withval=$with_localedir; LOCALEDIR=$withval withval=$with_localedir; LOCALEDIR=$withval
else else
LOCALEDIR='${prefix}/share/locale' LOCALEDIR="${prefix}/share/locale"
fi fi
fi fi
@ -11955,7 +11955,7 @@ fi
if test "${with_staticdir+set}" = set; then : if test "${with_staticdir+set}" = set; then :
withval=$with_staticdir; STATICDIR=$withval withval=$with_staticdir; STATICDIR=$withval
else else
STATICDIR='${exec_prefix}/sbin' STATICDIR="${exec_prefix}/sbin"
fi fi
@ -11964,7 +11964,7 @@ fi
if test "${with_usrlibdir+set}" = set; then : if test "${with_usrlibdir+set}" = set; then :
withval=$with_usrlibdir; usrlibdir=$withval withval=$with_usrlibdir; usrlibdir=$withval
else else
usrlibdir='${prefix}/lib' usrlibdir="${prefix}/lib"
fi fi
@ -11973,7 +11973,7 @@ fi
if test "${with_usrsbindir+set}" = set; then : if test "${with_usrsbindir+set}" = set; then :
withval=$with_usrsbindir; usrsbindir=$withval withval=$with_usrsbindir; usrsbindir=$withval
else else
usrsbindir='${prefix}/sbin' usrsbindir="${prefix}/sbin"
fi fi
@ -11983,7 +11983,7 @@ fi
if test "${with_udev_prefix+set}" = set; then : if test "${with_udev_prefix+set}" = set; then :
withval=$with_udev_prefix; udev_prefix=$withval withval=$with_udev_prefix; udev_prefix=$withval
else else
udev_prefix='${exec_prefix}' udev_prefix="${exec_prefix}"
fi fi
@ -12019,7 +12019,7 @@ test -z "$systemdutildir" && systemdutildir='${exec_prefix}/lib/systemd';
if test "${with_tmpfilesdir+set}" = set; then : if test "${with_tmpfilesdir+set}" = set; then :
withval=$with_tmpfilesdir; tmpfilesdir=$withval withval=$with_tmpfilesdir; tmpfilesdir=$withval
else else
tmpfilesdir='${prefix}/lib/tmpfiles.d' tmpfilesdir="${prefix}/lib/tmpfiles.d"
fi fi
################################################################################ ################################################################################

14
configure.in
View File

@ -628,7 +628,7 @@ AC_MSG_RESULT($OCF)
AC_ARG_WITH(ocfdir, AC_ARG_WITH(ocfdir,
AC_HELP_STRING([--with-ocfdir=DIR], AC_HELP_STRING([--with-ocfdir=DIR],
[install OCF files in [PREFIX/lib/ocf/resource.d/lvm2]]), [install OCF files in [PREFIX/lib/ocf/resource.d/lvm2]]),
OCFDIR=$withval, OCFDIR='${prefix}/lib/ocf/resource.d/lvm2') OCFDIR=$withval, OCFDIR="${prefix}/lib/ocf/resource.d/lvm2")
################################################################################ ################################################################################
dnl -- Init pkg-config with dummy invokation: dnl -- Init pkg-config with dummy invokation:
@ -1438,7 +1438,7 @@ if test "$INTL" = yes; then
AC_ARG_WITH(localedir, AC_ARG_WITH(localedir,
AC_HELP_STRING([--with-localedir=DIR], AC_HELP_STRING([--with-localedir=DIR],
[translation files in DIR [PREFIX/share/locale]]), [translation files in DIR [PREFIX/share/locale]]),
LOCALEDIR=$withval, LOCALEDIR='${prefix}/share/locale') LOCALEDIR=$withval, LOCALEDIR="${prefix}/share/locale")
fi fi
################################################################################ ################################################################################
@ -1451,23 +1451,23 @@ AC_ARG_WITH(confdir,
AC_ARG_WITH(staticdir, AC_ARG_WITH(staticdir,
AC_HELP_STRING([--with-staticdir=DIR], AC_HELP_STRING([--with-staticdir=DIR],
[static binaries in DIR [EPREFIX/sbin]]), [static binaries in DIR [EPREFIX/sbin]]),
STATICDIR=$withval, STATICDIR='${exec_prefix}/sbin') STATICDIR=$withval, STATICDIR="${exec_prefix}/sbin")
AC_ARG_WITH(usrlibdir, AC_ARG_WITH(usrlibdir,
AC_HELP_STRING([--with-usrlibdir=DIR], AC_HELP_STRING([--with-usrlibdir=DIR],
[usrlib in DIR [PREFIX/lib]]), [usrlib in DIR [PREFIX/lib]]),
usrlibdir=$withval, usrlibdir='${prefix}/lib') usrlibdir=$withval, usrlibdir="${prefix}/lib")
AC_ARG_WITH(usrsbindir, AC_ARG_WITH(usrsbindir,
AC_HELP_STRING([--with-usrsbindir=DIR], AC_HELP_STRING([--with-usrsbindir=DIR],
[usrsbin executables in DIR [PREFIX/sbin]]), [usrsbin executables in DIR [PREFIX/sbin]]),
usrsbindir=$withval, usrsbindir='${prefix}/sbin') usrsbindir=$withval, usrsbindir="${prefix}/sbin")
################################################################################ ################################################################################
AC_ARG_WITH(udev_prefix, AC_ARG_WITH(udev_prefix,
AC_HELP_STRING([--with-udev-prefix=UPREFIX], AC_HELP_STRING([--with-udev-prefix=UPREFIX],
[install udev rule files in UPREFIX [EPREFIX]]), [install udev rule files in UPREFIX [EPREFIX]]),
udev_prefix=$withval, udev_prefix='${exec_prefix}') udev_prefix=$withval, udev_prefix="${exec_prefix}")
AC_ARG_WITH(udevdir, AC_ARG_WITH(udevdir,
AC_HELP_STRING([--with-udevdir=DIR], AC_HELP_STRING([--with-udevdir=DIR],
@ -1494,7 +1494,7 @@ test -z "$systemdutildir" && systemdutildir='${exec_prefix}/lib/systemd';
AC_ARG_WITH(tmpfilesdir, AC_ARG_WITH(tmpfilesdir,
AC_HELP_STRING([--with-tmpfilesdir=DIR], AC_HELP_STRING([--with-tmpfilesdir=DIR],
[install configuration files for management of volatile files and directories in DIR [PREFIX/lib/tmpfiles.d]]), [install configuration files for management of volatile files and directories in DIR [PREFIX/lib/tmpfiles.d]]),
tmpfilesdir=$withval, tmpfilesdir='${prefix}/lib/tmpfiles.d') tmpfilesdir=$withval, tmpfilesdir="${prefix}/lib/tmpfiles.d")
################################################################################ ################################################################################
dnl -- Ensure additional headers required dnl -- Ensure additional headers required
if test "$READLINE" = yes; then if test "$READLINE" = yes; then