summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2014-09-10 23:43:00 +0100
committerPádraig Brady <P@draigBrady.com>2014-09-10 23:46:54 +0100
commit3cf19b5e5e5d166a478f84dbb28cfa7cd8e89229 (patch)
tree41a22c0bea3f72355c3966c887c29ebbeb4e1723 /src
parent6f9b01873ee3c9e2be5daedc5b095a44d37a577c (diff)
downloadcoreutils-3cf19b5e5e5d166a478f84dbb28cfa7cd8e89229.tar.xz
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.
Diffstat (limited to 'src')
-rw-r--r--src/local.mk10
1 files changed, 5 insertions, 5 deletions
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)