Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
	* sysdeps/unix/sysv/linux/configure.in: Set libc_cv_sysconfdir
	depending on the configure option --sysconfdir.
        Closes PR libc/1762.
        Patch by Andreas Schwab <schwab@suse.de>.
  • Loading branch information
Andreas Jaeger committed Jun 14, 2000
1 parent e85db9d commit cee49e0
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
2000-06-14 Andreas Jaeger <aj@suse.de>

* sysdeps/unix/sysv/linux/configure.in: Set libc_cv_sysconfdir
depending on the configure option --sysconfdir.
Closes PR libc/1762.
Patch by Andreas Schwab <schwab@suse.de>.

* sysdeps/mips/dl-machine.h: Pass finalizer correctly to user
entry point.
Reported by Jim Pick <jim@jimpick.com>.
Expand Down
9 changes: 7 additions & 2 deletions sysdeps/unix/sysv/linux/configure
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,12 @@ if test "$prefix" = "/usr" -o "$prefix" = "/usr/"; then
else
libc_cv_slibdir="/lib"
fi
libc_cv_sysconfdir="/etc"
# 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
libc_cv_rootsbindir="/sbin"
fi

Expand Down Expand Up @@ -189,7 +194,7 @@ if test $host = $build; then
ac_prefix=$ac_default_prefix
fi
echo $ac_n "checking for symlinks in ${ac_prefix}/include""... $ac_c" 1>&6
echo "configure:193: checking for symlinks in ${ac_prefix}/include" >&5
echo "configure:198: checking for symlinks in ${ac_prefix}/include" >&5
ac_message=
if test -L ${ac_prefix}/include/net; then
ac_message="$ac_message
Expand Down
7 changes: 6 additions & 1 deletion sysdeps/unix/sysv/linux/configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,12 @@ if test "$prefix" = "/usr" -o "$prefix" = "/usr/"; then
else
libc_cv_slibdir="/lib"
fi
libc_cv_sysconfdir="/etc"
# 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
libc_cv_rootsbindir="/sbin"
fi

Expand Down

0 comments on commit cee49e0

Please sign in to comment.