mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
stdbuf: fix automake variable name to work with cutting edge automake
* src/Makefile.am (pkglibexec_PROGRAMS): Rename from pkglib_PROGRAMS. The latter is invalid. Without this change, automake v1.11-373-g9ca6326 and newer (on master) would fail with this: `pkglibdir' is not a legitimate directory for `PROGRAMS' This changes the default installation directory of libstdbuf.so from $prefix/lib/coreutils/ to $prefix/libexec/coreutils/ * src/stdbuf.c (set_LD_PRELOAD): Search in PKGLIBEXECDIR, not PKGLIBDIR, since that's where we install libstdbuf.so. Do not search in "", the system default search path.
This commit is contained in:
1 parent
24b3c8b160
commit
e23f179557
2 files changed
+5
-6
No files matched your search
+1
-1
@@ -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 \
|
||||
|
||||
+4
-5
@@ -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
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user