diff options
| author | Roland McGrath <roland@gnu.org> | 1998-08-20 22:02:17 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1998-08-20 22:02:17 +0000 |
| commit | 926e512f4086995379623feab2146a96ca2f9d92 (patch) | |
| tree | 268aa06d3a1169dd1bb299cdcfb695804c645ec2 /elf/Makefile | |
| parent | d762684b511b6a425d9e0e2ff7473ffbfc98687d (diff) | |
| download | glibc-926e512f4086995379623feab2146a96ca2f9d92.tar.gz glibc-926e512f4086995379623feab2146a96ca2f9d92.tar.xz glibc-926e512f4086995379623feab2146a96ca2f9d92.zip | |
1998-08-21 Roland McGrath <roland@baalperazim.frob.com>
* elf/ldd.bash.in (TEXTDOMAIN, TEXTDOMAINDIR): Surround setting these with magic comments ###BASH-ONLY and ###END-BASH-ONLY. * elf/Makefile ($(objpfx)ldd): Generate always from ldd.bash.in. (common-ldd-rewrite): New variable, old contents of $(sh-ldd-rewrite). (sh-ldd-rewrite): Use that, add cmds to remove code surrounded by those magic comments, and to use /bin/sh for @BASH@. (bash-ldd-rewrite): Use $(common-ldd-rewrite). * elf/ldd.sh.in: File removed.
Diffstat (limited to 'elf/Makefile')
| -rw-r--r-- | elf/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/elf/Makefile b/elf/Makefile index ead48f5850..3771ffb685 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -164,9 +164,11 @@ $(inst_slibdir)/$(rtld-installed-name): \ $(make-shlib-link) -sh-ldd-rewrite = -e 's%@RTLD@%$(slibdir)/$(rtld-installed-name)%g' \ - -e 's%@VERSION@%$(version)%g' -bash-ldd-rewrite = $(sh-ldd-rewrite) -e 's%@BASH@%$(BASH)%g' \ +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' +bash-ldd-rewrite = $(common-ldd-rewrite) -e 's%@BASH@%$(BASH)%g' \ -e 's%@TEXTDOMAINDIR@%$(localedir)%g' ifneq ($(have-bash2),yes) @@ -185,7 +187,7 @@ sed $($(ldd-shell)-ldd-rewrite) < $< | sed -f $(ldd-rewrite-script) > $@.new endef endif -$(objpfx)ldd: ldd.$(ldd-shell).in $(common-objpfx)soversions.mk \ +$(objpfx)ldd: ldd.bash.in $(common-objpfx)soversions.mk \ $(common-objpfx)config.make $(gen-ldd) chmod 555 $@.new |