From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25897 invoked by alias); 1 Jul 2011 10:42:36 -0000 Received: (qmail 25881 invoked by uid 22791); 1 Jul 2011 10:42:36 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,TW_DB,TW_FN,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 01 Jul 2011 10:42:19 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p61AgIXd028221 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 1 Jul 2011 06:42:18 -0400 Received: from hase (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p61AgH1p015637 for ; Fri, 1 Jul 2011 06:42:18 -0400 From: Andreas Schwab To: libc-hacker@sourceware.org Subject: [PATCH] Define vardbdir relative to prefix X-Yow: Who wants some OYSTERS with SEN-SEN an' COOL WHIP? Date: Fri, 01 Jul 2011 10:42:00 -0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2011-07/txt/msg00001.txt.bz2 2011-07-01 Andreas Schwab * configure.in (libc_cv_rootsbindir): Substitute. * configure: Regenerate. * config.make.in (localstatedir): Define. * Makeconfig (localstatedir): Define. (vardbdir): Use $(localstatedir). * sysdeps/unix/sysv/linux/configure.in (libc_cv_localstatedir): Set to /var by default. * sysdeps/unix/sysv/linux/configure: Regenerate. --- Makeconfig | 9 ++++++++- config.make.in | 1 + configure | 3 +++ configure.in | 2 ++ sysdeps/unix/sysv/linux/configure | 5 +++++ sysdeps/unix/sysv/linux/configure.in | 5 +++++ 6 files changed, 24 insertions(+), 1 deletions(-) diff --git a/Makeconfig b/Makeconfig index 1110811..8a6cd8b 100644 --- a/Makeconfig +++ b/Makeconfig @@ -291,9 +291,16 @@ sysconfdir = $(prefix)/etc endif inst_sysconfdir = $(install_root)$(sysconfdir) +# Where to install data files which the programs modify +# while they run, and that pertain to one specific machine. +ifndef localstatedir +localstatedir = $(prefix)/var +endif +inst_localstatedir = $(install_root)$(localstatedir) + # Directory for the database files and Makefile for nss_db. ifndef vardbdir -vardbdir = /var/db +vardbdir = $(localstatedir)/db endif inst_vardbdir = $(install_root)$(vardbdir) diff --git a/config.make.in b/config.make.in index 0656b1b..1606b17 100644 --- a/config.make.in +++ b/config.make.in @@ -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@ diff --git a/configure b/configure index 20e7340..9e5c47b 100755 --- a/configure +++ b/configure @@ -627,6 +627,7 @@ libc_cv_cc_avx libc_cv_cc_sse4 libc_cv_cpp_asm_debuginfo libc_cv_forced_unwind +libc_cv_localstatedir libc_cv_rootsbindir libc_cv_sysconfdir libc_cv_localedir @@ -7646,6 +7647,7 @@ sizeof_long_double=$ac_cv_sizeof_long_double 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 @@ -7708,6 +7710,7 @@ fi + if test $elf = yes; then $as_echo "#define HAVE_ELF 1" >>confdefs.h diff --git a/configure.in b/configure.in index f2b3921..127161c 100644 --- a/configure.in +++ b/configure.in @@ -2175,6 +2175,7 @@ AC_SUBST(sizeof_long_double) 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 @@ -2219,6 +2220,7 @@ AC_SUBST(libc_cv_slibdir) AC_SUBST(libc_cv_localedir) AC_SUBST(libc_cv_sysconfdir) AC_SUBST(libc_cv_rootsbindir) +AC_SUBST(libc_cv_localstatedir) AC_SUBST(libc_cv_forced_unwind) dnl sysdeps/CPU/configure.in checks set this via arch-specific asm tests diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index d05bd13..7ed7489 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -430,6 +430,11 @@ case "$prefix" in else libc_cv_sysconfdir=$sysconfdir fi + if test $localstatedir = '${prefix}/var'; then + libc_cv_localstatedir=/var + else + libc_cv_localstatedir=$localstatedir + fi libc_cv_rootsbindir="/sbin" ;; esac diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in index 8f00407..8bb8508 100644 --- a/sysdeps/unix/sysv/linux/configure.in +++ b/sysdeps/unix/sysv/linux/configure.in @@ -169,6 +169,11 @@ case "$prefix" in else libc_cv_sysconfdir=$sysconfdir fi + if test $localstatedir = '${prefix}/var'; then + libc_cv_localstatedir=/var + else + libc_cv_localstatedir=$localstatedir + fi libc_cv_rootsbindir="/sbin" ;; esac -- 1.7.6 -- Andreas Schwab, schwab@redhat.com GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E "And now for something completely different."