Fix sysconfdir handling
Andreas Jaeger
aj@suse.de
Mon Jul 9 04:51:00 GMT 2001
My last patch for fixing the sysconfdir bug reported by Peter Simons
is broken.
Looking further into this, I've nailed it down to us not always
assigning libc_cv_sysconfdir.
I'm appending a patch that works for me. It backs out my previous
patch and makes just one additional assignment.
I've applied the patch to CVS,
Andreas
2001-07-09 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/configure.in: Revert patch from
2001-07-05 for sysconfdir handling.
* config.make.in (sysconfdir): Likewise.
* configure.in: Likewise.
* configure.in: Always assign libc_cv_sysconfdir.
============================================================
Index: sysdeps/unix/sysv/linux/configure.in
--- sysdeps/unix/sysv/linux/configure.in 2001/07/06 16:14:27 1.41
+++ sysdeps/unix/sysv/linux/configure.in 2001/07/09 11:48:58
@@ -114,7 +114,9 @@
fi
# Allow the user to override the path with --sysconfdir
if test $sysconfdir = '${prefix}/etc'; then
- sysconfdir=/etc
+ libc_cv_sysconfdir=/etc
+ else
+ libc_cv_sysconfdir=$sysconfdir
fi
libc_cv_rootsbindir="/sbin"
fi
============================================================
Index: config.make.in
--- config.make.in 2001/07/06 07:17:14 1.77
+++ config.make.in 2001/07/09 11:48:58
@@ -13,7 +13,7 @@
libdir = @libdir@
slibdir = @libc_cv_slibdir@
localedir = @libc_cv_localedir@
-sysconfdir = @sysconfdir@
+sysconfdir = @libc_cv_sysconfdir@
libexecdir = @libexecdir@
rootsbindir = @libc_cv_rootsbindir@
infodir = @infodir@
============================================================
Index: configure.in
--- configure.in 2001/07/07 19:05:03 1.320
+++ configure.in 2001/07/09 11:48:58
@@ -1403,6 +1403,7 @@
# They also can set these variables.
use_ldconfig=no
ldd_rewrite_script=no
+libc_cv_sysconfdir=$sysconfdir
# Iterate over all the sysdep directories we will use, running their
# configure fragments, and looking for a uname implementation.
@@ -1514,6 +1515,7 @@
AC_SUBST(libc_cv_slibdir)
AC_SUBST(libc_cv_localedir)
+AC_SUBST(libc_cv_sysconfdir)
AC_SUBST(libc_cv_rootsbindir)
AC_SUBST(use_ldconfig)
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.inka.de
http://www.suse.de/~aj
More information about the Libc-alpha
mailing list