AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 14:00:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Respect --localstatedir for /var/db parent directory.

Browse Source
This commit is contained in:
Roland McGrath 2012-06-22 10:11:07 -07:00
parent 116a106aaf
commit 4248b1b1cf
7 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2012-06-22 Roland McGrath <roland@hack.frob.com>
* configure.in (libc_cv_localstatedir): New substituted variable.
* configure: Regenerated.
* config.make.in (localstatedir): New variable, substituted from
libc_cv_localstatedir.
* Makeconfig (vardbdir): Use $(localstatedir) in place of /var.
* sysdeps/gnu/configure.in (libc_cv_localstatedir): Change
${prefix}/var to /var when we change ${prefix}/etc to /etc.
* sysdeps/gnu/configure: Regenerated.
2012-06-21 Jeff Law <law@redhat.com>
[BZ #14277]

2
Makeconfig
View File

@ -287,7 +287,7 @@ inst_sysconfdir = $(install_root)$(sysconfdir)
# Directory for the database files and Makefile for nss_db.
ifndef vardbdir
vardbdir = /var/db
vardbdir = $(localstatedir)/db
endif
inst_vardbdir = $(install_root)$(vardbdir)

1
config.make.in
View File

@ -18,6 +18,7 @@ rootsbindir = @libc_cv_rootsbindir@
infodir = @infodir@
includedir = @includedir@
datarootdir = @datarootdir@
localstatedir = @libc_cv_localstatedir@
# Should we use and build ldconfig?
use-ldconfig = @use_ldconfig@

3
configure vendored
View File

@ -592,6 +592,7 @@ libc_cv_cc_sse4
libc_cv_cpp_asm_debuginfo
libc_cv_forced_unwind
libc_cv_rootsbindir
libc_cv_localstatedir
libc_cv_sysconfdir
libc_cv_localedir
libc_cv_slibdir
@ -7448,6 +7449,7 @@ fi
use_ldconfig=no
ldd_rewrite_script=no
libc_cv_sysconfdir=$sysconfdir
libc_cv_localstatedir=$localstatedir
libc_cv_gcc_unwind_find_fde=no
libc_cv_idn=no
@ -7511,6 +7513,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -fPIC is default" >&5

2
configure.in
View File

@ -2119,6 +2119,7 @@ AC_SUBST(libc_extra_cflags)
use_ldconfig=no
ldd_rewrite_script=no
libc_cv_sysconfdir=$sysconfdir
libc_cv_localstatedir=$localstatedir
libc_cv_gcc_unwind_find_fde=no
libc_cv_idn=no
@ -2159,6 +2160,7 @@ AC_SUBST(old_glibc_headers)
AC_SUBST(libc_cv_slibdir)
AC_SUBST(libc_cv_localedir)
AC_SUBST(libc_cv_sysconfdir)
AC_SUBST(libc_cv_localstatedir)
AC_SUBST(libc_cv_rootsbindir)
AC_SUBST(libc_cv_forced_unwind)

8
sysdeps/gnu/configure vendored
View File

@ -25,12 +25,18 @@ case "$prefix" in
libc_cv_slibdir=/lib
;;
esac
# Allow the user to override the path with --sysconfdir
# Allow the user to override the path with --sysconfdir.
if test "$sysconfdir" = '${prefix}/etc'; then
libc_cv_sysconfdir=/etc
else
libc_cv_sysconfdir=$sysconfdir
fi
# Allow the user to override the path with --localstatedir.
if test "$localstatedir" = '${prefix}/var'; then
libc_cv_localstatedir=/var
else
libc_cv_localstatedir=$localstatedir
fi
libc_cv_rootsbindir=/sbin
;;
esac

8
sysdeps/gnu/configure.in
View File

@ -25,12 +25,18 @@ case "$prefix" in
libc_cv_slibdir=/lib
;;
esac
# Allow the user to override the path with --sysconfdir
# Allow the user to override the path with --sysconfdir.
if test "$sysconfdir" = '${prefix}/etc'; then
libc_cv_sysconfdir=/etc
else
libc_cv_sysconfdir=$sysconfdir
fi
# Allow the user to override the path with --localstatedir.
if test "$localstatedir" = '${prefix}/var'; then
libc_cv_localstatedir=/var
else
libc_cv_localstatedir=$localstatedir
fi
libc_cv_rootsbindir=/sbin
;;
esac