From 89ecf8cabebfd13e50473fba7fb98f65a52b02d8 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sun, 20 Jan 2013 21:56:57 +1000 Subject: Make path to ldconfig configurable The FHS (2.3) says having ldconfig in /sbin is optional and it is usually located in /usr/sbin. So /sbin/ldconfig should not be hard coded in pacman. Instead, provide a configure option --with-ldconfig that defaults to the current path. Signed-off-by: Allan McRae --- lib/libalpm/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index c88326f2..7d9ee635 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -621,12 +621,12 @@ int _alpm_ldconfig(alpm_handle_t *handle) snprintf(line, PATH_MAX, "%setc/ld.so.conf", handle->root); if(access(line, F_OK) == 0) { - snprintf(line, PATH_MAX, "%ssbin/ldconfig", handle->root); + snprintf(line, PATH_MAX, "%s%s", handle->root, LDCONFIG); if(access(line, X_OK) == 0) { char arg0[32]; char *argv[] = { arg0, NULL }; strcpy(arg0, "ldconfig"); - return _alpm_run_chroot(handle, "/sbin/ldconfig", argv); + return _alpm_run_chroot(handle, LDCONFIG, argv); } } -- cgit v1.2.3-70-g09d2