shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-18 10:04:20 +03:00
Code Releases Activity

configure: update localedir

Browse Source 
Previous patch incorrectly skipped replace of @LOCALEDIR@.

The standard option is --localedir  so use --with-localedir
as backward compatible option and set localedir if it's not
yet been set (if the could ever happen).

Use double-eval to translate $datarootdir to $prefix to real dir.
This commit is contained in:
Zdenek Kabelac 2015-05-18 18:13:07 +02:00
parent aa2d39c2ca
commit dc49e1cde0
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -1724,7 +1724,7 @@ Optional Packages:
lvmetad pidfile [PID_DIR/lvmetad.pid] lvmetad pidfile [PID_DIR/lvmetad.pid]
--with-lvmpolld-pidfile=PATH --with-lvmpolld-pidfile=PATH
lvmpolld pidfile [PID_DIR/lvmpolld.pid] lvmpolld pidfile [PID_DIR/lvmpolld.pid]
--with-localedir=DIR translation files in DIR [PREFIX/share/locale] --with-localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--with-confdir=DIR configuration files in DIR [/etc] --with-confdir=DIR configuration files in DIR [/etc]
--with-staticdir=DIR static binaries in DIR [EPREFIX/sbin] --with-staticdir=DIR static binaries in DIR [EPREFIX/sbin]
--with-usrlibdir=DIR usrlib in DIR [PREFIX/lib] --with-usrlibdir=DIR usrlib in DIR [PREFIX/lib]
@ -12432,9 +12432,9 @@ fi
# Check whether --with-localedir was given. # Check whether --with-localedir was given.
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=${localedir-'${datarootdir}/locale'}
fi fi
@ -12442,9 +12442,10 @@ cat >>confdefs.h <<_ACEOF
#define INTL_PACKAGE "$INTL_PACKAGE" #define INTL_PACKAGE "$INTL_PACKAGE"
_ACEOF _ACEOF
# double eval needed ${datarootdir} -> ${prefix}/share -> real path
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define LOCALEDIR "$LOCALEDIR" #define LOCALEDIR "$(eval echo $(eval echo $localedir))"
_ACEOF _ACEOF
fi fi
@ -13262,6 +13263,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'`
################################################################################ ################################################################################

8
configure.in
View File

@ -1516,10 +1516,11 @@ 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]]), [locale-dependent data [DATAROOTDIR/locale]]),
LOCALEDIR=$withval, LOCALEDIR="${prefix}/share/locale") localedir=$withval, localedir=${localedir-'${datarootdir}/locale'})
AC_DEFINE_UNQUOTED([INTL_PACKAGE], ["$INTL_PACKAGE"], [Internalization package]) AC_DEFINE_UNQUOTED([INTL_PACKAGE], ["$INTL_PACKAGE"], [Internalization package])
AC_DEFINE_UNQUOTED([LOCALEDIR], ["$LOCALEDIR"], [Location of translation files]) # double eval needed ${datarootdir} -> ${prefix}/share -> real path
AC_DEFINE_UNQUOTED([LOCALEDIR], ["$(eval echo $(eval echo $localedir))"], [Locale-dependent data])
fi fi
################################################################################ ################################################################################
@ -1813,6 +1814,7 @@ AC_SUBST(LVM_PATCHLEVEL)
AC_SUBST(LVM_PATH) AC_SUBST(LVM_PATH)
AC_SUBST(LVM_RELEASE) AC_SUBST(LVM_RELEASE)
AC_SUBST(LVM_RELEASE_DATE) AC_SUBST(LVM_RELEASE_DATE)
AC_SUBST(localedir)
AC_SUBST(MANGLING) AC_SUBST(MANGLING)
AC_SUBST(MIRRORS) AC_SUBST(MIRRORS)
AC_SUBST(MSGFMT) AC_SUBST(MSGFMT)

2
lib/misc/configure.h.in
View File

@ -507,7 +507,7 @@
/* Internalization package */ /* Internalization package */
#undef INTL_PACKAGE #undef INTL_PACKAGE
/* Location of translation files */ /* Locale-dependent data */
#undef LOCALEDIR #undef LOCALEDIR
/* Define to 1 if `lstat' dereferences a symlink specified with a trailing /* Define to 1 if `lstat' dereferences a symlink specified with a trailing

2
make.tmpl.in
View File

@ -82,7 +82,7 @@ datarootdir = @datarootdir@
datadir = $(DESTDIR)@datadir@ datadir = $(DESTDIR)@datadir@
infodir = $(DESTDIR)@infodir@ infodir = $(DESTDIR)@infodir@
mandir = $(DESTDIR)@mandir@ mandir = $(DESTDIR)@mandir@
localedir = $(DESTDIR)@LOCALEDIR@ localedir = $(DESTDIR)@localedir@
staticdir = $(DESTDIR)@STATICDIR@ staticdir = $(DESTDIR)@STATICDIR@
udevdir = $(DESTDIR)@udevdir@ udevdir = $(DESTDIR)@udevdir@
pkgconfigdir = $(usrlibdir)/pkgconfig pkgconfigdir = $(usrlibdir)/pkgconfig