diff options
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/Makefile | 3 | ||||
| -rw-r--r-- | elf/ldd.bash.in | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/elf/Makefile b/elf/Makefile index 3771ffb..5cc13b2 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -166,8 +166,7 @@ $(inst_slibdir)/$(rtld-installed-name): \ common-ldd-rewrite = -e 's%@RTLD@%$(slibdir)/$(rtld-installed-name)%g' \ -e 's%@VERSION@%$(version)%g' -sh-ldd-rewrite = $(common-ldd-rewrite) -e 's%@BASH@%/bin/sh%g' \ - -e 's/\$$"/"/g;/^\#\#\#BASH-ONLY/,/\#\#\#END-BASH-ONLY/d' +sh-ldd-rewrite = $(common-ldd-rewrite) -e 's%@BASH@%/bin/sh%g;s/\$$"/"/g' bash-ldd-rewrite = $(common-ldd-rewrite) -e 's%@BASH@%$(BASH)%g' \ -e 's%@TEXTDOMAINDIR@%$(localedir)%g' diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in index f0d50e4..f6ffa6b 100644 --- a/elf/ldd.bash.in +++ b/elf/ldd.bash.in @@ -24,11 +24,9 @@ # run-time dynamic linker as a command and setting the environment # variable LD_TRACE_LOADED_OBJECTS to a non-empty value. -###BASH-ONLY # We should be able to find the translation right at the beginning. TEXTDOMAIN=libc TEXTDOMAINDIR=@TEXTDOMAINDIR@ -###END-BASH-ONLY RTLD=@RTLD@ warn= |