diff options
author | Peter Rajnoha <prajnoha@redhat.com> | 2014-11-19 16:02:41 +0100 |
---|---|---|
committer | Peter Rajnoha <prajnoha@redhat.com> | 2014-11-19 16:03:27 +0100 |
commit | 7639eae8919e5872143562db8118d039f5a41225 (patch) | |
tree | 31b9ba56d3cb8c0680db2dea9e61b14ad9dc537d | |
parent | 74ed1ba9f99aaf16906d53c28ad604eaa7a21419 (diff) | |
download | lvm2-7639eae8919e5872143562db8118d039f5a41225.tar.gz |
configure: expand prefix and exec_prefix directly in configure
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).
-rwxr-xr-x | configure | 14 | ||||
-rw-r--r-- | configure.in | 14 |
2 files changed, 14 insertions, 14 deletions
@@ -8441,7 +8441,7 @@ $as_echo "$OCF" >&6; } if test "${with_ocfdir+set}" = set; then : withval=$with_ocfdir; OCFDIR=$withval else - OCFDIR='${prefix}/lib/ocf/resource.d/lvm2' + OCFDIR="${prefix}/lib/ocf/resource.d/lvm2" fi @@ -11935,7 +11935,7 @@ fi if test "${with_localedir+set}" = set; then : withval=$with_localedir; LOCALEDIR=$withval else - LOCALEDIR='${prefix}/share/locale' + LOCALEDIR="${prefix}/share/locale" fi fi @@ -11955,7 +11955,7 @@ fi if test "${with_staticdir+set}" = set; then : withval=$with_staticdir; STATICDIR=$withval else - STATICDIR='${exec_prefix}/sbin' + STATICDIR="${exec_prefix}/sbin" fi @@ -11964,7 +11964,7 @@ fi if test "${with_usrlibdir+set}" = set; then : withval=$with_usrlibdir; usrlibdir=$withval else - usrlibdir='${prefix}/lib' + usrlibdir="${prefix}/lib" fi @@ -11973,7 +11973,7 @@ fi if test "${with_usrsbindir+set}" = set; then : withval=$with_usrsbindir; usrsbindir=$withval else - usrsbindir='${prefix}/sbin' + usrsbindir="${prefix}/sbin" fi @@ -11983,7 +11983,7 @@ fi if test "${with_udev_prefix+set}" = set; then : withval=$with_udev_prefix; udev_prefix=$withval else - udev_prefix='${exec_prefix}' + udev_prefix="${exec_prefix}" fi @@ -12019,7 +12019,7 @@ test -z "$systemdutildir" && systemdutildir='${exec_prefix}/lib/systemd'; if test "${with_tmpfilesdir+set}" = set; then : withval=$with_tmpfilesdir; tmpfilesdir=$withval else - tmpfilesdir='${prefix}/lib/tmpfiles.d' + tmpfilesdir="${prefix}/lib/tmpfiles.d" fi ################################################################################ diff --git a/configure.in b/configure.in index d4e367d36..952aef962 100644 --- a/configure.in +++ b/configure.in @@ -628,7 +628,7 @@ AC_MSG_RESULT($OCF) AC_ARG_WITH(ocfdir, AC_HELP_STRING([--with-ocfdir=DIR], [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: @@ -1438,7 +1438,7 @@ if test "$INTL" = yes; then AC_ARG_WITH(localedir, AC_HELP_STRING([--with-localedir=DIR], [translation files in DIR [PREFIX/share/locale]]), - LOCALEDIR=$withval, LOCALEDIR='${prefix}/share/locale') + LOCALEDIR=$withval, LOCALEDIR="${prefix}/share/locale") fi ################################################################################ @@ -1451,23 +1451,23 @@ AC_ARG_WITH(confdir, AC_ARG_WITH(staticdir, AC_HELP_STRING([--with-staticdir=DIR], [static binaries in DIR [EPREFIX/sbin]]), - STATICDIR=$withval, STATICDIR='${exec_prefix}/sbin') + STATICDIR=$withval, STATICDIR="${exec_prefix}/sbin") AC_ARG_WITH(usrlibdir, AC_HELP_STRING([--with-usrlibdir=DIR], [usrlib in DIR [PREFIX/lib]]), - usrlibdir=$withval, usrlibdir='${prefix}/lib') + usrlibdir=$withval, usrlibdir="${prefix}/lib") AC_ARG_WITH(usrsbindir, AC_HELP_STRING([--with-usrsbindir=DIR], [usrsbin executables in DIR [PREFIX/sbin]]), - usrsbindir=$withval, usrsbindir='${prefix}/sbin') + usrsbindir=$withval, usrsbindir="${prefix}/sbin") ################################################################################ AC_ARG_WITH(udev_prefix, AC_HELP_STRING([--with-udev-prefix=UPREFIX], [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_HELP_STRING([--with-udevdir=DIR], @@ -1494,7 +1494,7 @@ test -z "$systemdutildir" && systemdutildir='${exec_prefix}/lib/systemd'; AC_ARG_WITH(tmpfilesdir, AC_HELP_STRING([--with-tmpfilesdir=DIR], [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 if test "$READLINE" = yes; then |