diff options
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/stdbuf.c | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 516e1e59e..ef0e7a4d3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -138,7 +138,7 @@ bin_PROGRAMS = $(OPTIONAL_BIN_PROGS) noinst_PROGRAMS = setuidgid getlimits -pkglib_PROGRAMS = $(OPTIONAL_PKGLIB_PROGS) +pkglibexec_PROGRAMS = $(OPTIONAL_PKGLIB_PROGS) noinst_HEADERS = \ chown-core.h \ diff --git a/src/stdbuf.c b/src/stdbuf.c index f51dc6a6c..6fd803c95 100644 --- a/src/stdbuf.c +++ b/src/stdbuf.c @@ -193,15 +193,14 @@ set_LD_PRELOAD (void) char *LD_PRELOAD; /* Note this would auto add the appropriate search path for "libstdbuf.so": - gcc stdbuf.c -Wl,-rpath,'$ORIGIN' -Wl,-rpath,$PKGLIBDIR + gcc stdbuf.c -Wl,-rpath,'$ORIGIN' -Wl,-rpath,$PKGLIBEXECDIR However we want the lookup done for the exec'd command not stdbuf. - Since we don't link against libstdbuf.so add it to LIBDIR rather than - LIBEXECDIR, as we'll search for it in the "sys default" case below. */ + Since we don't link against libstdbuf.so add it to PKGLIBEXECDIR + rather than to LIBDIR. */ char const *const search_path[] = { program_path, - PKGLIBDIR, - "", /* sys default */ + PKGLIBEXECDIR, NULL }; |