From 3cf19b5e5e5d166a478f84dbb28cfa7cd8e89229 Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Wed, 10 Sep 2014 23:43:00 +0100 Subject: build: adjust previous transformations on libstdbuf name * src/local.mk (transform): commit v8.23-22-g6f9b018 discarded all transformations on the libstdbuf.so name. Be more conservative and only exclude the $(program_transform_name) portion for libstdbuf. --- src/local.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/local.mk') diff --git a/src/local.mk b/src/local.mk index 0a6f217e0..6e80d31c4 100644 --- a/src/local.mk +++ b/src/local.mk @@ -336,17 +336,17 @@ copy_sources = \ src/extent-scan.c \ src/extent-scan.h +# Use 'ginstall' in the definition of PROGRAMS and in dependencies to avoid +# confusion with the 'install' target. The install rule transforms 'ginstall' +# to install before applying any user-specified name transformations. + # Don't apply prefix transformations to libstdbuf shared lib # as that's not generally needed, and we need to reference the # name directly in LD_PRELOAD etc. In general it's surprising # that $(transform) is applied to libexec at all given that is # for internal package naming, not privy to $(transform). -# Use 'ginstall' in the definition of PROGRAMS and in dependencies to avoid -# confusion with the 'install' target. The install rule transforms 'ginstall' -# to install before applying any user-specified name transformations. - -transform = /libstdbuf/q;s/ginstall/install/;$(program_transform_name) +transform = s/ginstall/install/;/libstdbuf/!$(program_transform_name) src_ginstall_SOURCES = src/install.c src/prog-fprintf.c $(copy_sources) \ $(selinux_sources) -- cgit v1.2.3-54-g00ecf